Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAGECLOUD-4448-4449: Deliver core patches #4

Merged
merged 3 commits into from
Nov 1, 2019
Merged

MAGECLOUD-4448-4449: Deliver core patches #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da5183a
MAGECLOUD-4448-4449: Deliver core patches
shiftedreality Oct 29, 2019
84ac6f3
MAGECLOUD-4448-4449: Deliver core patches
shiftedreality Oct 31, 2019
961634c
Merge branches 'MAGECLOUD-4448-4449' and 'develop' of https://github.…
shiftedreality Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Provides critical fixes for Magento 2 Enterprise Edition",
"type": "magento2-component",
"version": "1.0.0",
"license": "OSL-3",
"license": "OSL-3.0",
"require": {
"php": "^7.0",
"ext-json": "*",
Expand Down
6 changes: 6 additions & 0 deletions patches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,12 @@
},
"Backward Compatibility of new Mail Interfaces": {
"2.3.3": "MAGECLOUD-4442__fix_backward_compatibility_of_new_mail_interfaces__2.3.3.patch"
},
"Catalog Product pagination does not work on Elasticsearch 6.x": {
"2.3.3": "MC-21696__fix_broken_pagination_on_ES6__2.3.3.patch"
},
"Catalog Product collection method chaining is broken": {
"2.3.3": "MC-21820__fix_broken_method_chaining__2.3.3.patch"
}
},
"monolog/monolog": {
Expand Down
11 changes: 11 additions & 0 deletions patches/MC-21696__fix_broken_pagination_on_ES6__2.3.3.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff -Naur a/vendor/magento/module-elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php b/vendor/magento/module-elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
--- a/vendor/magento/module-elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
+++ b/vendor/magento/module-elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
@@ -50,6 +50,7 @@ class SearchResultApplier implements SearchResultApplierInterface
foreach ($this->searchResult->getItems() as $item) {
$ids[] = (int)$item->getId();
}
+ $this->collection->setPageSize(null);
$this->collection->getSelect()->where('e.entity_id IN (?)', $ids);
$orderList = join(',', $ids);
$this->collection->getSelect()->reset(\Magento\Framework\DB\Select::ORDER);
12 changes: 12 additions & 0 deletions patches/MC-21820__fix_broken_method_chaining__2.3.3.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -Naur a/vendor/magento/module-catalog/Model/ResourceModel/Product/Collection.php b/vendor/magento/module-catalog/Model/ResourceModel/Product/Collection.php
--- a/vendor/magento/module-catalog/Model/ResourceModel/Product/Collection.php
+++ b/vendor/magento/module-catalog/Model/ResourceModel/Product/Collection.php
@@ -1584,6 +1584,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
} else {
return parent::addAttributeToFilter($attribute, $condition, $joinType);
}
+
+ return $this;
}

/**