MAGECLOUD-4448-4449: Deliver core patches (#4)

Author: shiftedreality

composer.json

@@ -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": "*",

patches.json

@@ -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": {

patches/MC-21696__fix_broken_pagination_on_ES6__2.3.3.patch

@@ -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);

patches/MC-21820__fix_broken_method_chaining__2.3.3.patch

@@ -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;
+     }
+
+     /**