Merge branch '2.10.x' into 2.11.x

Author: rbayet

src/module-elasticsuite-catalog-optimizer/Test/Unit/Model/Optimizer/Preview/SearchQueryTest.php

@@ -105,7 +105,7 @@ private function getSpellcheckerRequestFactoryMock(): MockObject
     {
         $spellcheckRequestFactory = $this->getMockBuilder(SpellcheckRequestFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $spellcheckRequestFactory->method('create')->willReturnCallback(function ($args) {

src/module-elasticsuite-catalog-optimizer/Test/Unit/Model/Optimizer/PreviewTest.php

@@ -500,7 +500,7 @@ private function getOptimizerMock(): \PHPUnit\Framework\MockObject\MockObject
         return $this
             ->getMockBuilder(Optimizer::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getSearchContainer', 'getQuickSearchContainer', 'getCatalogViewContainer'])
+            ->addMethods(['getSearchContainer', 'getQuickSearchContainer', 'getCatalogViewContainer'])
             ->getMock();
     }
 

src/module-elasticsuite-catalog/Test/Unit/Helper/AbstractAttributeTest.php

@@ -55,7 +55,7 @@ public function testFieldTypes($attributeId, $backendType, $usesSource, $sourceM
 
         $attributeFactoryMock = $this->getMockBuilder('\Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory')
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $attributeFactoryMock->method('create')->will(($this->returnValue($attributeMock)));

src/module-elasticsuite-core/Test/Unit/Model/SuggestedTermsProviderTest.php

@@ -61,7 +61,7 @@ protected function setUp(): void
         $this->termDataProviderMock           = $this->createMock(TermDataProvider::class);
         $this->queryStringProviderFactoryMock = $this->getMockBuilder(QueryStringProvider::class. 'Factory')
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $this->suggestedTermsProvider = new SuggestedTermsProvider(

src/module-elasticsuite-core/Test/Unit/Search/Adapter/Elasticsuite/AdapterTest.php

@@ -112,7 +112,7 @@ private function getQueryResponseFactoryMock()
     {
         $queryResponseFactoryMock = $this->getMockBuilder(QueryResponse::class . 'Factory')
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $queryResponseFactoryMock->method('create')->will($this->returnArgument(0));

src/module-elasticsuite-core/Test/Unit/Search/Request/Aggregation/AggregationFactoryTest.php

@@ -14,6 +14,7 @@
 namespace Smile\ElasticsuiteCore\Test\Unit\Search\Request\Aggregation;
 
 use Smile\ElasticsuiteCore\Search\Request\Aggregation\AggregationFactory;
+use Smile\ElasticsuiteCore\Search\Request\Aggregation\Bucket\Term;
 use Smile\ElasticsuiteCore\Search\Request\BucketInterface;
 
 /**
@@ -55,11 +56,14 @@ public function testInvalidAggregationCreate()
      */
     private function getAggregationFactory()
     {
-        $aggregationMock = $this->getMockBuilder(BucketInterface::class)->getMock();
+        $aggregationMock = $this->getMockBuilder(Term::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $factoryName      = sprintf("%s%s", BucketInterface::class, 'Factory');
+        $factoryName      = sprintf("%s%s", Term::class, 'Factory');
         $aggregationFactoryMock = $this->getMockBuilder($factoryName)
-            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->onlyMethods(['create'])
             ->getMock();
 
         $aggregationFactoryMock->method('create')

src/module-elasticsuite-core/Test/Unit/Search/Request/Aggregation/PipelineFactoryTest.php

@@ -13,6 +13,7 @@
  */
 namespace Smile\ElasticsuiteCore\Test\Unit\Search\Request\Aggregation;
 
+use Smile\ElasticsuiteCore\Search\Request\Aggregation\Pipeline\MaxBucket;
 use Smile\ElasticsuiteCore\Search\Request\Aggregation\PipelineFactory;
 use Smile\ElasticsuiteCore\Search\Request\PipelineInterface;
 
@@ -55,11 +56,14 @@ public function testInvalidPipelineCreate()
      */
     private function getPipelineFactory()
     {
-        $pipelineMock = $this->getMockBuilder(PipelineInterface::class)->getMock();
+        $pipelineMock = $this->getMockBuilder(MaxBucket::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $factoryName = sprintf("%s%s", PipelineInterface::class, 'Factory');
+        $factoryName = sprintf("%s%s", MaxBucket::class, 'Factory');
         $pipelineFactoryMock = $this->getMockBuilder($factoryName)
-            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->onlyMethods(['create'])
             ->getMock();
 
         $pipelineFactoryMock->method('create')

src/module-elasticsuite-core/Test/Unit/Search/Request/BuilderTest.php

@@ -107,7 +107,7 @@ private function getSpellcheckerRequestFactoryMock(): MockObject
     {
         $spellcheckRequestFactory = $this->getMockBuilder(SpellcheckRequestFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $spellcheckRequestFactory->method('create')->willReturnCallback(function ($args) {
@@ -127,7 +127,7 @@ private function getContainerConfigurationFactoryMock(): MockObject
     {
         $containerConfigurationFactory = $this->getMockBuilder(ContainerConfigurationFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $containerConfigurationFactory->method('create')->willReturnCallback(function ($args) {
@@ -199,7 +199,7 @@ private function getSearchRequestFactoryMock(): MockObject
     {
         $requestFactory = $this->getMockBuilder(RequestFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $requestFactory->method('create')->willReturn([]);
@@ -216,7 +216,7 @@ private function getDimensionFactoryMock(): MockObject
     {
         $dimensionFactory = $this->getMockBuilder(DimensionFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $dimensionFactory->method('create')->willReturn([]);

src/module-elasticsuite-core/Test/Unit/Search/Request/Query/QueryFactoryTest.php

@@ -13,6 +13,7 @@
  */
 namespace Smile\ElasticsuiteCore\Test\Unit\Search\Request\Query;
 
+use Smile\ElasticsuiteCore\Search\Request\Query\Boolean;
 use Smile\ElasticsuiteCore\Search\Request\Query\QueryFactory;
 use Smile\ElasticsuiteCore\Search\Request\QueryInterface;
 
@@ -55,11 +56,14 @@ public function testInvalidQueryCreate()
      */
     private function getQueryFactory()
     {
-        $queryMock = $this->getMockBuilder(QueryInterface::class)->getMock();
+        $queryMock = $this->getMockBuilder(Boolean::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $factoryName      = sprintf("%s%s", QueryInterface::class, 'Factory');
+        $factoryName      = sprintf("%s%s", Boolean::class, 'Factory');
         $queryFactoryMock = $this->getMockBuilder($factoryName)
-            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->onlyMethods(['create'])
             ->getMock();
 
         $queryFactoryMock->method('create')