Skip to content

Commit 96d02bf

Browse files
rganinrganin
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into MAGETWO-90971
2 parents a2ded12 + 57b5fdb commit 96d02bf

File tree

202 files changed

+4753
-1536
lines changed

Some content is hidden

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

202 files changed

+4753
-1536
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,35 @@
1-
<!--- Provide a general summary of the issue in the Title above -->
2-
<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
1+
<!---
2+
Thank you for contributing to Magento.
3+
To help us process this issue we recommend that you add the following information:
4+
- Summary of the issue,
5+
- Information on your environment,
6+
- Steps to reproduce,
7+
- Expected and actual results,
8+
9+
Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
10+
-->
311

412
### Preconditions
5-
<!--- Provide a more detailed information of environment you use -->
6-
<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
13+
<!---
14+
Please provide as detailed information about your environment as possible.
15+
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
16+
-->
717
1.
818
2.
919

1020
### Steps to reproduce
11-
<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant -->
21+
<!---
22+
It is important to provide a set of clear steps to reproduce this bug.
23+
If relevant please include code samples
24+
-->
1225
1.
1326
2.
1427
3.
1528

1629
### Expected result
1730
<!--- Tell us what should happen -->
18-
1.
31+
1. [Screenshot, logs]
1932

2033
### Actual result
2134
<!--- Tell us what happens instead -->
2235
1. [Screenshot, logs]
23-
24-
<!--- (This may be platform independent comment) -->

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,32 @@
1-
<!--- Provide a general summary of the Pull Request in the Title above -->
1+
<!---
2+
Thank you for contributing to Magento.
3+
To help us process this pull request we recommend that you add the following information:
4+
- Summary of the pull request,
5+
- Issue(s) related to the changes made,
6+
- Manual testing scenarios,
7+
-->
8+
9+
<!--- Please provide a general summary of the Pull Request in the Title above -->
210

311
### Description
4-
<!--- Provide a description of the changes proposed in the pull request -->
12+
<!---
13+
Please provide a description of the changes proposed in the pull request.
14+
Letting us know what has changed and why it needed changing will help us validate this pull request.
15+
-->
516

617
### Fixed Issues (if relevant)
7-
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
18+
<!---
19+
If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
20+
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
21+
-->
822
1. magento/magento2#<issue_number>: Issue title
923
2. ...
1024

1125
### Manual testing scenarios
12-
<!--- Provide a set of unambiguous steps to test the proposed code change -->
26+
<!---
27+
Please provide a set of unambiguous steps to test the proposed code change.
28+
Giving us manual testing scenarios will help with the processing and validation process.
29+
-->
1330
1. ...
1431
2. ...
1532

‎.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ language: php
1818
php:
1919
- 7.1
2020
- 7.2
21-
git:
22-
depth: 5
2321
env:
2422
global:
2523
- COMPOSER_BIN_DIR=~/bin

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function render(\Magento\Framework\DataObject $row)
6565
*/
6666
protected function _getCheckboxHtml($value, $checked)
6767
{
68-
$id = 'id_' . rand(0, 999);
68+
$id = 'id_' . random_int(0, 999);
6969
$html = '<label class="data-grid-checkbox-cell-inner" for="'. $id .'">';
7070
$html .= '<input type="checkbox" name="' . $this->getColumn()->getName() . '" ';
7171
$html .= 'id="' . $id . '" data-role="select-row"';

‎app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ public function getWidgetOptionsJson(array $customOptions = [])
689689
'limit' => ToolbarModel::LIMIT_PARAM_NAME,
690690
'modeDefault' => $defaultMode,
691691
'directionDefault' => $this->_direction ?: ProductList::DEFAULT_SORT_DIRECTION,
692-
'orderDefault' => $this->_productListHelper->getDefaultSortField(),
692+
'orderDefault' => $this->getOrderField(),
693693
'limitDefault' => $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
694694
'url' => $this->getPagerUrl(),
695695
];

‎app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ protected function getTemporaryTreeIndexTableName()
597597
if (empty($this->tempTreeIndexTableName)) {
598598
$this->tempTreeIndexTableName = $this->connection->getTableName('temp_catalog_category_tree_index')
599599
. '_'
600-
. substr(md5(time() . rand(0, 999999999)), 0, 8);
600+
. substr(md5(time() . random_int(0, 999999999)), 0, 8);
601601
}
602602

603603
return $this->tempTreeIndexTableName;
@@ -659,25 +659,30 @@ protected function makeTempCategoryTreeIndex()
659659
*/
660660
protected function fillTempCategoryTreeIndex($temporaryName)
661661
{
662-
// This finds all children (cc2) that descend from a parent (cc) by path.
663-
// For example, cc.path may be '1/2', and cc2.path may be '1/2/3/4/5'.
664-
$temporarySelect = $this->connection->select()->from(
665-
['cc' => $this->getTable('catalog_category_entity')],
666-
['parent_id' => 'entity_id']
667-
)->joinInner(
668-
['cc2' => $this->getTable('catalog_category_entity')],
669-
'cc2.path LIKE ' . $this->connection->getConcatSql(
670-
[$this->connection->quoteIdentifier('cc.path'), $this->connection->quote('/%')]
671-
),
672-
['child_id' => 'entity_id']
662+
$selects = $this->prepareSelectsByRange(
663+
$this->connection->select()
664+
->from(
665+
['c' => $this->getTable('catalog_category_entity')],
666+
['entity_id', 'path']
667+
),
668+
'entity_id'
673669
);
674670

675-
$this->connection->query(
676-
$temporarySelect->insertFromSelect(
677-
$temporaryName,
678-
['parent_id', 'child_id']
679-
)
680-
);
671+
foreach ($selects as $select) {
672+
$values = [];
673+
674+
foreach ($this->connection->fetchAll($select) as $category) {
675+
foreach (explode('/', $category['path']) as $parentId) {
676+
if ($parentId !== $category['entity_id']) {
677+
$values[] = [$parentId, $category['entity_id']];
678+
}
679+
}
680+
}
681+
682+
if (count($values) > 0) {
683+
$this->connection->insertArray($temporaryName, ['parent_id', 'child_id'], $values);
684+
}
685+
}
681686
}
682687

683688
/**

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ private function customizeAddAttributeModal(array $meta)
182182
. '.create_new_attribute_modal',
183183
'actionName' => 'toggleModal',
184184
],
185+
[
186+
'targetName' => 'product_form.product_form.add_attribute_modal'
187+
. '.create_new_attribute_modal.product_attribute_add_form',
188+
'actionName' => 'destroyInserted'
189+
],
185190
[
186191
'targetName'
187192
=> 'product_form.product_form.add_attribute_modal'

‎app/code/Magento/Catalog/view/adminhtml/requirejs-config.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
var config = {
77
map: {
88
'*': {
9-
categoryForm: 'Magento_Catalog/catalog/category/form',
10-
newCategoryDialog: 'Magento_Catalog/js/new-category-dialog',
11-
categoryTree: 'Magento_Catalog/js/category-tree',
12-
productGallery: 'Magento_Catalog/js/product-gallery',
13-
baseImage: 'Magento_Catalog/catalog/base-image-uploader',
14-
productAttributes: 'Magento_Catalog/catalog/product-attributes'
9+
categoryForm: 'Magento_Catalog/catalog/category/form',
10+
newCategoryDialog: 'Magento_Catalog/js/new-category-dialog',
11+
categoryTree: 'Magento_Catalog/js/category-tree',
12+
productGallery: 'Magento_Catalog/js/product-gallery',
13+
baseImage: 'Magento_Catalog/catalog/base-image-uploader',
14+
productAttributes: 'Magento_Catalog/catalog/product-attributes',
15+
categoryCheckboxTree: 'Magento_Catalog/js/category-checkbox-tree'
1516
}
1617
},
1718
deps: [

0 commit comments

Comments
 (0)