Fix Smile-SA#3578, phpcs/phpunit issues

Author: vahonc

Resources/tests/unit/.phpunit.result.cache

@@ -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/Preview/SearchQueryTest.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-optimizer/Test/Unit/Model/Optimizer/PreviewTest.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-catalog/Test/Unit/Helper/AbstractAttributeTest.php

@@ -75,15 +75,15 @@ public function getIdField();
      * @param string|NULL               $analyzer     Search analyzer.
      * @param string|NULL               $defaultField Default field added to the list of fields.
      *                                                All field weighted with 1 will be ignored if present.
-     * @param integer                   $boost        A multiplier applied to fields default weight.
+     * @param integer|null              $boost        A multiplier applied to fields default weight.
      * @param FieldFilterInterface|null $fieldFilter  A filter applied to fields.
      *
      * @return float[]
      */
     public function getWeightedSearchProperties(
         ?string $analyzer = null,
         ?string $defaultField = null,
-        int $boost = 1,
+        ?int $boost = 1,
         ?FieldFilterInterface $fieldFilter = null
     );
 

src/module-elasticsuite-core/Api/Index/MappingInterface.php

@@ -167,7 +167,7 @@ public function getIdField()
     public function getWeightedSearchProperties(
         ?string $analyzer = null,
         ?string $defaultField = null,
-        int $boost = 1,
+        ?int $boost = 1,
         ?FieldFilterInterface $fieldFilter = null
     ) {
         $weightedFields = [];

src/module-elasticsuite-core/Index/Mapping.php

@@ -51,7 +51,7 @@ class DateHistogram extends Histogram
      * @param string|null         $nestedPath       Nested path for nested bucket.
      * @param QueryInterface|null $filter           Bucket filter.
      * @param QueryInterface|null $nestedFilter     Nested filter for the bucket.
-     * @param int                 $interval         Histogram interval.
+     * @param string|int          $interval         Histogram interval.
      * @param string|null         $calendarInterval Histogram interval.
      * @param string              $fixedInterval    Histogram interval.
      * @param integer             $minDocCount      Histogram min doc count.
@@ -66,7 +66,7 @@ public function __construct(
         ?string $nestedPath = null,
         ?QueryInterface $filter = null,
         ?QueryInterface $nestedFilter = null,
-        $interval = "1d", // Deprecated.
+        string|int $interval = "1d", // Deprecated.
         ?string $calendarInterval = null,
         string $fixedInterval = "1d",
         int $minDocCount = 0,
@@ -83,7 +83,7 @@ public function __construct(
             $nestedPath,
             $filter,
             $nestedFilter,
-            $interval,
+            (int) $interval,
             $minDocCount,
             $extendedBounds
         );

src/module-elasticsuite-core/Search/Request/Aggregation/Bucket/DateHistogram.php

@@ -67,7 +67,7 @@ class Term extends AbstractBucket
      * @param QueryInterface|null $filter       Bucket filter.
      * @param QueryInterface|null $nestedFilter Nested filter for the bucket.
      * @param integer             $size         Bucket size.
-     * @param string              $sortOrder    Bucket sort order.
+     * @param array|string        $sortOrder    Bucket sort order.
      * @param array               $include      Include bucket filter.
      * @param array               $exclude      Exclude bucket filter.
      * @param int|null            $minDocCount  Min doc count bucket filter.
@@ -82,7 +82,7 @@ public function __construct(
         ?QueryInterface $filter = null,
         ?QueryInterface $nestedFilter = null,
         int $size = 0,
-        string $sortOrder = BucketInterface::SORT_ORDER_COUNT,
+        array|string $sortOrder = BucketInterface::SORT_ORDER_COUNT,
         array $include = [],
         array $exclude = [],
         ?int $minDocCount = null

src/module-elasticsuite-core/Search/Request/Aggregation/Bucket/Term.php

@@ -50,7 +50,7 @@ class TopHits extends AbstractBucket
      * @param string              $name         Bucket name.
      * @param array               $sourceFields Source fields to fetch from the hits.
      * @param int                 $size         Bucket size.
-     * @param string              $sortOrder    Bucket Sort Order.
+     * @param array|string        $sortOrder    Bucket Sort Order.
      * @param MetricInterface[]   $metrics      Bucket metrics.
      * @param BucketInterface[]   $childBuckets Child buckets.
      * @param PipelineInterface[] $pipelines    Bucket pipelines.
@@ -62,7 +62,7 @@ public function __construct(
         string $name,
         array $sourceFields = [],
         int $size = 1,
-        string $sortOrder = BucketInterface::SORT_ORDER_COUNT,
+        array|string $sortOrder = BucketInterface::SORT_ORDER_COUNT,
         array $metrics = [],
         array $childBuckets = [],
         array $pipelines = [],

src/module-elasticsuite-core/Search/Request/Aggregation/Bucket/TopHits.php

@@ -357,7 +357,7 @@ private function getPhoneticQuery(ContainerConfigurationInterface $containerConf
      * @param string|null                     $analyzer        Target analyzer.
      * @param FieldFilterInterface|null       $fieldFilter     Field filter.
      * @param string|null                     $defaultField    Default search field.
-     * @param integer                         $boost           Additional boost applied to the fields (multiplicative).
+     * @param integer|null                    $boost           Additional boost applied to the fields (multiplicative).
      *
      * @return array
      */
@@ -366,7 +366,7 @@ private function getWeightedFields(
         ?string $analyzer = null,
         ?FieldFilterInterface $fieldFilter = null,
         ?string $defaultField = null,
-        int $boost = 1
+        ?int $boost = 1
     ) {
 
         $mapping = $containerConfig->getMapping();

src/module-elasticsuite-core/Search/Request/Query/Fulltext/QueryBuilder.php

@@ -51,8 +51,8 @@ class SpanOr implements SpanQueryInterface
      */
     public function __construct(
         array   $clauses = [],
-        ?string $name    = null,
-        string  $boost   = QueryInterface::DEFAULT_BOOST_VALUE
+        ?string $name = null,
+        string  $boost = QueryInterface::DEFAULT_BOOST_VALUE
     ) {
         $this->clauses = $clauses;
         $this->name    = $name;

src/module-elasticsuite-core/Search/Request/Query/Span/SpanOr.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/Model/SuggestedTermsProviderTest.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/Adapter/Elasticsuite/AdapterTest.php

@@ -59,7 +59,7 @@ private function getAggregationFactory()
 
         $factoryName      = sprintf("%s%s", BucketInterface::class, 'Factory');
         $aggregationFactoryMock = $this->getMockBuilder($factoryName)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $aggregationFactoryMock->method('create')

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

@@ -59,7 +59,7 @@ private function getPipelineFactory()
 
         $factoryName = sprintf("%s%s", PipelineInterface::class, 'Factory');
         $pipelineFactoryMock = $this->getMockBuilder($factoryName)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $pipelineFactoryMock->method('create')

src/module-elasticsuite-core/Test/Unit/Search/Request/Aggregation/PipelineFactoryTest.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/BuilderTest.php

@@ -59,7 +59,7 @@ private function getQueryFactory()
 
         $factoryName      = sprintf("%s%s", QueryInterface::class, 'Factory');
         $queryFactoryMock = $this->getMockBuilder($factoryName)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $queryFactoryMock->method('create')