Merge remote-tracking branch 'origin/2.3.0-release' into MAGETWO-95595

Author: fascinosum

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php

@@ -12,7 +12,6 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchCriteria\Helper\Filter as FilterHelper;
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult;
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResultFactory;
-use Magento\Framework\EntityManager\EntityManager;
 use Magento\Search\Api\SearchInterface;
 
 /**
@@ -45,31 +44,42 @@ class Search
      */
     private $metadataPool;
 
+    /**
+     * @var \Magento\Search\Model\Search\PageSizeProvider
+     */
+    private $pageSizeProvider;
+
     /**
      * @param SearchInterface $search
      * @param FilterHelper $filterHelper
      * @param Filter $filterQuery
      * @param SearchResultFactory $searchResultFactory
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
+     * @param \Magento\Search\Model\Search\PageSizeProvider $pageSize
      */
     public function __construct(
         SearchInterface $search,
         FilterHelper $filterHelper,
         Filter $filterQuery,
         SearchResultFactory $searchResultFactory,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool
+        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
+        \Magento\Search\Model\Search\PageSizeProvider $pageSize
     ) {
         $this->search = $search;
         $this->filterHelper = $filterHelper;
         $this->filterQuery = $filterQuery;
         $this->searchResultFactory = $searchResultFactory;
         $this->metadataPool = $metadataPool;
+        $this->pageSizeProvider = $pageSize;
     }
 
     /**
      * Return results of full text catalog search of given term, and will return filtered results if filter is specified
      *
      * @param SearchCriteriaInterface $searchCriteria
+     * @param ResolveInfo $info
      * @return SearchResult
+     * @throws \Exception
      */
     public function getResult(SearchCriteriaInterface $searchCriteria, ResolveInfo $info) : SearchResult
     {
@@ -79,7 +89,8 @@ public function getResult(SearchCriteriaInterface $searchCriteria, ResolveInfo $
         $realPageSize = $searchCriteria->getPageSize();
         $realCurrentPage = $searchCriteria->getCurrentPage();
         // Current page must be set to 0 and page size to max for search to grab all ID's as temporary workaround
-        $searchCriteria->setPageSize(PHP_INT_MAX);
+        $pageSize = $this->pageSizeProvider->getMaxPageSize();
+        $searchCriteria->setPageSize($pageSize);
         $searchCriteria->setCurrentPage(0);
         $itemsResults = $this->search->search($searchCriteria);
 

app/code/Magento/Elasticsearch/etc/di.xml

@@ -413,4 +413,12 @@
             <argument name="fieldTypeResolver" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver</argument>
         </arguments>
     </type>
+    <type name="Magento\Search\Model\Search\PageSizeProvider">
+        <arguments>
+            <argument name="pageSizeBySearchEngine" xsi:type="array">
+                <item name="elasticsearch" xsi:type="number">2147483647</item>
+                <item name="elasticsearch5" xsi:type="number">2147483647</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Search/Model/Search/PageSizeProvider.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Search\Model\Search;
+
+/**
+ * Returns max  page size by search engine name
+ * @api
+ */
+class PageSizeProvider
+{
+    /**
+     * @var \Magento\Search\Model\EngineResolver
+     */
+    private $engineResolver;
+
+    /**
+     * @var array
+     */
+    private $pageSizeBySearchEngine;
+
+    /**
+     * @param \Magento\Search\Model\EngineResolver $engineResolver
+     * @param array $pageSizeBySearchEngine
+     */
+    public function __construct(
+        \Magento\Search\Model\EngineResolver $engineResolver,
+        array $pageSizeBySearchEngine = []
+    ) {
+        $this->engineResolver = $engineResolver;
+        $this->pageSizeBySearchEngine = $pageSizeBySearchEngine;
+    }
+
+    /**
+     * Returns max_page_size depends on engine
+     *
+     * @return integer
+     */
+    public function getMaxPageSize() : int
+    {
+        $searchEngine = $this->engineResolver->getCurrentSearchEngine();
+
+        $pageSize = PHP_INT_MAX;
+        if (isset($this->pageSizeBySearchEngine[$searchEngine])) {
+            $pageSize = $this->pageSizeBySearchEngine[$searchEngine];
+        }
+
+        return (int)$pageSize;
+    }
+}

app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Search\Test\Unit\Model\Search;
+
+use Magento\Search\Model\Search\PageSizeProvider;
+
+class PageSizeProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PageSizeProvider
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Search\Model\EngineResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $pageSizeBySearchEngineMock;
+
+    public function setUp()
+    {
+        $this->pageSizeBySearchEngineMock = $this->getMockBuilder(\Magento\Search\Model\EngineResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = new PageSizeProvider(
+
+            $this->pageSizeBySearchEngineMock,
+            ['search' => 10,
+                'catalogSearch3' => 11
+            ]
+        );
+    }
+
+    /**
+     * @param string $searchEngine
+     * @param int $size
+     * @dataProvider getPageSizeDataProvider
+     */
+    public function testGetPageSize($searchEngine, $size)
+    {
+        $this->pageSizeBySearchEngineMock
+            ->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($searchEngine);
+        $this->assertEquals($size, $this->model->getMaxPageSize());
+    }
+
+    public function getPageSizeDataProvider()
+    {
+        return [
+            ['search', 10],
+            ['catalogSearch3', 11],
+            ['newSearch', PHP_INT_MAX]
+        ];
+    }
+}