Skip to content

Commit 4f94998

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #18439: Use SVG badge (by @hugovk) - #18343: Add required fields to templates (by @miguelbalparda) - #18506: Added missing throw tag for exception to docblock of construct (by @peterjaap) - #18505: Fixed typo from filed to field (by @peterjaap) - #18490: [Sales] Covering the AssignOrderToCustomerObserver by Unit Test (by @eduard13) - #18487: Prevent XSS on checkout (by @samgranger) - #18500: [Forwardport] Fix category tree in cart price rule #17493 (by @gelanivishal) - #18499: [Forwardport] Fix table rate failing for zip+4 address #17770 (by @gelanivishal) - #18498: [Forwardport] Fix setup wizard page logo (by @gelanivishal) - #18481: Added validation on maximum quantity allowed in shopping cart (by @gelanivishal) - #18434: [FORWARDPORT] [FEATURE] [issue-3283] Added Filter Support for Yes/No (by @lewisvoncken) - #18416: throw exception InvalidArgumentException during validate scheme (by @ArtsiomBruneuski) - #18404: [Forwardport] Implemented 17964: Backend Order creation Authorizenet: If invalid cr� (by @mage2pratik) - #18405: [2.3] Admin Grid column ordering/positioning not working when single store mode set On (by @gwharton) - #18394: [Forwardport] Fixed issue with lib-line-height mixin failing when value of 'normal'� (by @mage2pratik) - #17803: Make report bugs link optional (by @arnoudhgz) - #18271: Update CategoryProcessor.php (by @ulftietze) - #18221: Empty option label should always be a space even if attribute is required (by @VincentMarmiesse) - #18257: [Forwardport] Module Catalog: fix issue with custom option price conversion for different base currency on website level (by @oleksii-lisovyi) - #18204: [Forwardport] Fix currency symbol setting back to default #17567 (by @mage2pratik) Fixed GitHub Issues: - #17493: Catalog Rule & Selected Categories with level > 3 (reported by @SKovbel) has been fixed in #18500 by @gelanivishal in 2.3-develop branch Related commits: 1. cfc2339 - #17770: Table rate fail when using ZIP+4 shipping address (reported by @werfu) has been fixed in #18499 by @gelanivishal in 2.3-develop branch Related commits: 1. fe3fd54 - #18477: Set maximum Qty Allowed in Shopping Cart is 0 still allow adding to cart (reported by @duongdiep212) has been fixed in #18481 by @gelanivishal in 2.3-develop branch Related commits: 1. d866790 - #3283: «Yes/No» attributes should be allowed in the Layered Navigation (reported by @dmitry-fedyuk) has been fixed in #18434 by @lewisvoncken in 2.3-develop branch Related commits: 1. e6833c8 - #14555: Communication's component validator does not propagate exceptions, obscuring the cause of the error (reported by @nikita2206) has been fixed in #18416 by @ArtsiomBruneuski in 2.3-develop branch Related commits: 1. 9a1b8fd 2. 4f017f8 3. 6dd7115 4. 335c201 5. 7903cd5 6. dfda407 7. b2621a5 8. 7392ba6 9. b37d2d6 10. 9f1d4bf - #12070: M2.2.0 Admin Grid column ordering/positioning not working when single store mode set On (reported by @gwharton) has been fixed in #18405 by @gwharton in 2.3-develop branch Related commits: 1. ed1f6a5 - #18234: Product Import -> Upsert Category: Url Rewrites are just created for default website (reported by @ulftietze) has been fixed in #18271 by @ulftietze in 2.3-develop branch Related commits: 1. 53a3456 2. 543fce4 - #17567: Currency symbol cannot be changed back to default value from admin panel in Single-store mode (reported by @sivaschenko) has been fixed in #18204 by @mage2pratik in 2.3-develop branch Related commits: 1. 4741320
2 parents de50d12 + 8180574 commit 4f94998

File tree

45 files changed

+476
-114
lines changed

Some content is hidden

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

45 files changed

+476
-114
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@
55
- Information on your environment,
66
- Steps to reproduce,
77
- Expected and actual results,
8+
Fields marked with (*) are required. Please don't remove the template.
89
910
Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
1011
-->
1112

12-
### Preconditions
13+
### Preconditions (*)
1314
<!---
1415
Please provide as detailed information about your environment as possible.
1516
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
1617
-->
1718
1.
1819
2.
1920

20-
### Steps to reproduce
21+
### Steps to reproduce (*)
2122
<!---
2223
It is important to provide a set of clear steps to reproduce this bug.
2324
If relevant please include code samples
@@ -26,10 +27,10 @@
2627
2.
2728
3.
2829

29-
### Expected result
30+
### Expected result (*)
3031
<!--- Tell us what should happen -->
3132
1. [Screenshots, logs or description]
3233

33-
### Actual result
34+
### Actual result (*)
3435
<!--- Tell us what happens instead -->
3536
1. [Screenshots, logs or description]

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,29 @@ about: Technical issue with the Magento 2 core components
66

77
<!---
88
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
9+
Fields marked with (*) are required. Please don't remove the template.
910
-->
1011

11-
### Preconditions
12+
### Preconditions (*)
1213
<!---
1314
Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
1415
-->
1516
1.
1617
2.
1718

18-
### Steps to reproduce
19+
### Steps to reproduce (*)
1920
<!---
2021
Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
2122
-->
2223
1.
2324
2.
2425

25-
### Expected result
26+
### Expected result (*)
2627
<!--- Tell us what do you expect to happen. -->
2728
1. [Screenshots, logs or description]
2829
2.
2930

30-
### Actual result
31+
### Actual result (*)
3132
<!--- Tell us what happened instead. Include error messages and issues. -->
3233
1. [Screenshots, logs or description]
3334
2.

‎.github/ISSUE_TEMPLATE/developer-experience-issue.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ about: Issues related to customization, extensibility, modularity
66

77
<!---
88
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
9+
Fields marked with (*) are required. Please don't remove the template.
910
-->
1011

11-
### Summary
12+
### Summary (*)
1213
<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
1314

14-
### Examples
15+
### Examples (*)
1516
<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
1617

1718
### Proposed solution

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ about: Please consider reporting directly to https://github.com/magento/communit
55
---
66

77
<!---
8-
Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum.
8+
Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum. Fields marked with (*) are required. Please don't remove the template.
99
-->
1010

11-
### Description
11+
### Description (*)
1212
<!--- Describe the feature you would like to add. -->
1313

14-
### Expected behavior
14+
### Expected behavior (*)
1515
<!--- What is the expected behavior of this feature? How is it going to work? -->
1616

1717
### Benefits

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
To help us process this pull request we recommend that you add the following information:
44
- Summary of the pull request,
55
- Issue(s) related to the changes made,
6-
- Manual testing scenarios,
6+
- Manual testing scenarios
7+
Fields marked with (*) are required. Please don't remove the template.
78
-->
89

910
<!--- Please provide a general summary of the Pull Request in the Title above -->
1011

11-
### Description
12+
### Description (*)
1213
<!---
1314
Please provide a description of the changes proposed in the pull request.
1415
Letting us know what has changed and why it needed changing will help us validate this pull request.
@@ -22,15 +23,15 @@
2223
1. magento/magento2#<issue_number>: Issue title
2324
2. ...
2425

25-
### Manual testing scenarios
26+
### Manual testing scenarios (*)
2627
<!---
2728
Please provide a set of unambiguous steps to test the proposed code change.
2829
Giving us manual testing scenarios will help with the processing and validation process.
2930
-->
3031
1. ...
3132
2. ...
3233

33-
### Contribution checklist
34+
### Contribution checklist (*)
3435
- [ ] Pull request has a meaningful description of its purpose
3536
- [ ] All commits are accompanied by meaningful commit messages
3637
- [ ] All new or changed code is covered with unit/integration tests (if applicable)

‎README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
22
[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
33
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
4-
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
4+
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
55
<h2>Welcome</h2>
66
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
77

88
## Magento system requirements
9-
[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html)
9+
[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
1010

1111
## Install Magento
12-
To install Magento, see either:
1312

14-
* [Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html)
13+
* [Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
1514

1615
<h2>Contributing to the Magento 2 code base</h2>
1716
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -52,7 +51,7 @@ Stay up-to-date on the latest security news and patches for Magento by signing u
5251

5352
<h2>License</h2>
5453

55-
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
54+
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
5655

5756
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
5857
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact [email protected] for a copy.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ public function changeParent(
923923
$childrenCount = $this->getChildrenCount($category->getId()) + 1;
924924
$table = $this->getEntityTable();
925925
$connection = $this->getConnection();
926-
$levelFiled = $connection->quoteIdentifier('level');
926+
$levelField = $connection->quoteIdentifier('level');
927927
$pathField = $connection->quoteIdentifier('path');
928928

929929
/**
@@ -963,7 +963,7 @@ public function changeParent(
963963
$newPath . '/'
964964
) . ')'
965965
),
966-
'level' => new \Zend_Db_Expr($levelFiled . ' + ' . $levelDisposition)
966+
'level' => new \Zend_Db_Expr($levelField . ' + ' . $levelDisposition)
967967
],
968968
[$pathField . ' LIKE ?' => $category->getPath() . '/%']
969969
);

‎app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ public function __construct(
167167
}
168168

169169
/**
170+
* Init model
171+
*
170172
* @return void
171173
*/
172174
protected function _construct()
@@ -362,6 +364,7 @@ public function getStoreId()
362364

363365
/**
364366
* Retrieve apply to products array
367+
*
365368
* Return empty array if applied to all products
366369
*
367370
* @return string[]
@@ -478,7 +481,7 @@ protected function _isOriginalIndexable()
478481
$backendType = $this->getOrigData('backend_type');
479482
$frontendInput = $this->getOrigData('frontend_input');
480483

481-
if ($backendType == 'int' && $frontendInput == 'select') {
484+
if ($backendType == 'int' && ($frontendInput == 'select' || $frontendInput == 'boolean')) {
482485
return true;
483486
} elseif ($backendType == 'varchar' && $frontendInput == 'multiselect') {
484487
return true;
@@ -507,128 +510,128 @@ public function getIndexType()
507510
}
508511

509512
/**
513+
* @inheritdoc
510514
* @codeCoverageIgnoreStart
511-
* {@inheritdoc}
512515
*/
513516
public function getIsWysiwygEnabled()
514517
{
515518
return $this->_getData(self::IS_WYSIWYG_ENABLED);
516519
}
517520

518521
/**
519-
* {@inheritdoc}
522+
* @inheritdoc
520523
*/
521524
public function getIsHtmlAllowedOnFront()
522525
{
523526
return $this->_getData(self::IS_HTML_ALLOWED_ON_FRONT);
524527
}
525528

526529
/**
527-
* {@inheritdoc}
530+
* @inheritdoc
528531
*/
529532
public function getUsedForSortBy()
530533
{
531534
return $this->_getData(self::USED_FOR_SORT_BY);
532535
}
533536

534537
/**
535-
* {@inheritdoc}
538+
* @inheritdoc
536539
*/
537540
public function getIsFilterable()
538541
{
539542
return $this->_getData(self::IS_FILTERABLE);
540543
}
541544

542545
/**
543-
* {@inheritdoc}
546+
* @inheritdoc
544547
*/
545548
public function getIsFilterableInSearch()
546549
{
547550
return $this->_getData(self::IS_FILTERABLE_IN_SEARCH);
548551
}
549552

550553
/**
551-
* {@inheritdoc}
554+
* @inheritdoc
552555
*/
553556
public function getIsUsedInGrid()
554557
{
555558
return (bool)$this->_getData(self::IS_USED_IN_GRID);
556559
}
557560

558561
/**
559-
* {@inheritdoc}
562+
* @inheritdoc
560563
*/
561564
public function getIsVisibleInGrid()
562565
{
563566
return (bool)$this->_getData(self::IS_VISIBLE_IN_GRID);
564567
}
565568

566569
/**
567-
* {@inheritdoc}
570+
* @inheritdoc
568571
*/
569572
public function getIsFilterableInGrid()
570573
{
571574
return (bool)$this->_getData(self::IS_FILTERABLE_IN_GRID);
572575
}
573576

574577
/**
575-
* {@inheritdoc}
578+
* @inheritdoc
576579
*/
577580
public function getPosition()
578581
{
579582
return $this->_getData(self::POSITION);
580583
}
581584

582585
/**
583-
* {@inheritdoc}
586+
* @inheritdoc
584587
*/
585588
public function getIsSearchable()
586589
{
587590
return $this->_getData(self::IS_SEARCHABLE);
588591
}
589592

590593
/**
591-
* {@inheritdoc}
594+
* @inheritdoc
592595
*/
593596
public function getIsVisibleInAdvancedSearch()
594597
{
595598
return $this->_getData(self::IS_VISIBLE_IN_ADVANCED_SEARCH);
596599
}
597600

598601
/**
599-
* {@inheritdoc}
602+
* @inheritdoc
600603
*/
601604
public function getIsComparable()
602605
{
603606
return $this->_getData(self::IS_COMPARABLE);
604607
}
605608

606609
/**
607-
* {@inheritdoc}
610+
* @inheritdoc
608611
*/
609612
public function getIsUsedForPromoRules()
610613
{
611614
return $this->_getData(self::IS_USED_FOR_PROMO_RULES);
612615
}
613616

614617
/**
615-
* {@inheritdoc}
618+
* @inheritdoc
616619
*/
617620
public function getIsVisibleOnFront()
618621
{
619622
return $this->_getData(self::IS_VISIBLE_ON_FRONT);
620623
}
621624

622625
/**
623-
* {@inheritdoc}
626+
* @inheritdoc
624627
*/
625628
public function getUsedInProductListing()
626629
{
627630
return $this->_getData(self::USED_IN_PRODUCT_LISTING);
628631
}
629632

630633
/**
631-
* {@inheritdoc}
634+
* @inheritdoc
632635
*/
633636
public function getIsVisible()
634637
{
@@ -638,7 +641,7 @@ public function getIsVisible()
638641
//@codeCoverageIgnoreEnd
639642

640643
/**
641-
* {@inheritdoc}
644+
* @inheritdoc
642645
*/
643646
public function getScope()
644647
{
@@ -720,7 +723,7 @@ public function setPosition($position)
720723
/**
721724
* Set apply to value for the element
722725
*
723-
* @param string []|string
726+
* @param string[]|string $applyTo
724727
* @return $this
725728
*/
726729
public function setApplyTo($applyTo)
@@ -829,7 +832,7 @@ public function setScope($scope)
829832
}
830833

831834
/**
832-
* {@inheritdoc}
835+
* @inheritdoc
833836
*/
834837
public function afterDelete()
835838
{

0 commit comments

Comments
 (0)