Skip to content

Commit bd51a44

Browse files
vahoncvahonc
committed
Fix Smile-SA#3578, add supporting PHP 8.4 for ElasticSuite 2.11.x
1 parent 501d65c commit bd51a44

File tree

52 files changed

+272
-272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+272
-272
lines changed

‎src/module-elasticsuite-catalog-graph-ql/Model/Resolver/Aggregations.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public function resolve(
7878
Field $field,
7979
$context,
8080
ResolveInfo $info,
81-
array $value = null,
82-
array $args = null
81+
?array $value = null,
82+
?array $args = null
8383
) {
8484
if (!isset($value['layer_type']) || !isset($value['search_result'])) {
8585
return null;

‎src/module-elasticsuite-catalog-graph-ql/Model/Resolver/Layer/Filter/ViewMore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function __construct(
6565
/**
6666
* {@inheritDoc}
6767
*/
68-
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
68+
public function resolve(Field $field, $context, ResolveInfo $info, ?array $value = null, ?array $args = null)
6969
{
7070
$this->validateArgs($args);
7171
$this->viewMoreContext->setFilterName($args['filterName']);

‎src/module-elasticsuite-catalog-graph-ql/Model/Resolver/Products.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function __construct(
5757
/**
5858
* {@inheritDoc}
5959
*/
60-
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
60+
public function resolve(Field $field, $context, ResolveInfo $info, ?array $value = null, ?array $args = null)
6161
{
6262
$this->validateArgs($args);
6363
$this->contextUpdater->updateSearchContext($args);

‎src/module-elasticsuite-catalog-graph-ql/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use Magento\GraphQl\Model\Query\ContextInterface;
2121

2222
/**
23-
* Dummmy Search Criteria Processor.
23+
* Dummy Search Criteria Processor.
2424
* We do not need to filter again the product collection since the search engine is already doing it.
2525
*
2626
* @category Smile
@@ -36,7 +36,7 @@ public function process(
3636
Collection $collection,
3737
SearchCriteriaInterface $searchCriteria,
3838
array $attributeNames,
39-
ContextInterface $context = null
39+
?ContextInterface $context = null
4040
): Collection {
4141
return $collection;
4242
}

‎src/module-elasticsuite-catalog-graph-ql/Model/Resolver/Products/Query/Search.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function __construct(
7979
FieldSelection $fieldSelection,
8080
ProductSearch $productProvider,
8181
SearchCriteriaBuilder $searchCriteriaBuilder,
82-
Suggestions $suggestions = null
82+
?Suggestions $suggestions = null
8383
) {
8484
$this->search = $search;
8585
$this->searchResultFactory = $searchResultFactory;

‎src/module-elasticsuite-catalog-graph-ql/Plugin/Resolver/LayerFilters.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public function beforeResolve(
6464
Field $field,
6565
$context,
6666
ResolveInfo $info,
67-
array $value = null,
68-
array $args = null
67+
?array $value = null,
68+
?array $args = null
6969
) {
7070
if (!empty($value['search_result'])) {
7171
/** @var \Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult $searchResult */

‎src/module-elasticsuite-catalog-optimizer/Model/Optimizer.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ class Optimizer extends \Magento\Framework\Model\AbstractModel implements Optimi
6161
/**
6262
* Class constructor
6363
*
64-
* @param \Magento\Framework\Model\Context $context Context.
65-
* @param \Magento\Framework\Registry $registry Registry.
66-
* @param \Smile\ElasticsuiteCatalogRule\Model\RuleFactory $ruleFactory Rule factory.
67-
* @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter Date Filter.
68-
* @param \Magento\Framework\Serialize\SerializerInterface $serializer Serializer.
69-
* @param Optimizer\Limitation\IdentitiesFactory $limitationIdentitiesFactory Limitation Identities.
70-
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource Resource.
71-
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection Resource collection.
72-
* @param array $data Data.
64+
* @param \Magento\Framework\Model\Context $context Context.
65+
* @param \Magento\Framework\Registry $registry Registry.
66+
* @param \Smile\ElasticsuiteCatalogRule\Model\RuleFactory $ruleFactory Rule factory.
67+
* @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter Date Filter.
68+
* @param \Magento\Framework\Serialize\SerializerInterface $serializer Serializer.
69+
* @param Optimizer\Limitation\IdentitiesFactory $limitationIdentitiesFactory Limitation Identities.
70+
* @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource Resource.
71+
* @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection Resource collection.
72+
* @param array $data Data.
7373
*/
7474
public function __construct(
7575
\Magento\Framework\Model\Context $context,
@@ -78,8 +78,8 @@ public function __construct(
7878
\Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
7979
\Magento\Framework\Serialize\SerializerInterface $serializer,
8080
Optimizer\Limitation\IdentitiesFactory $limitationIdentitiesFactory,
81-
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
82-
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
81+
?\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
82+
?\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
8383
array $data = []
8484
) {
8585
parent::__construct($context, $registry, $resource, $resourceCollection, $data);

‎src/module-elasticsuite-catalog-optimizer/Model/Optimizer/Preview.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class Preview
102102
* @param Preview\ResultsBuilder $previewResultsBuilder Preview Results Builder.
103103
* @param ContextInterface $searchContext Search Context.
104104
* @param CategoryInterface|null $category Category Id to preview, if any.
105-
* @param string $queryText Query Text.
105+
* @param string|null $queryText Query Text.
106106
* @param int $size Preview size.
107107
* @param array $categoryPreviewContainers Category preview compatible containers.
108108
*/
@@ -114,10 +114,10 @@ public function __construct(
114114
ContainerConfigurationInterface $containerConfig,
115115
Preview\ResultsBuilder $previewResultsBuilder,
116116
ContextInterface $searchContext,
117-
CategoryInterface $category = null,
118-
$queryText = null,
119-
$size = 10,
120-
$categoryPreviewContainers = ['catalog_view_container']
117+
?CategoryInterface $category = null,
118+
?string $queryText = null,
119+
int $size = 10,
120+
array $categoryPreviewContainers = ['catalog_view_container']
121121
) {
122122
$this->size = $size;
123123
$this->previewItemFactory = $previewItemFactory;

‎src/module-elasticsuite-catalog-optimizer/Model/ResourceModel/Optimizer/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public function __construct(
5656
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
5757
\Magento\Framework\Event\ManagerInterface $eventManager,
5858
\Magento\Framework\Stdlib\DateTime\DateTime $date,
59-
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
60-
\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
59+
?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
60+
?\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
6161
) {
6262
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
6363

‎src/module-elasticsuite-catalog-optimizer/Model/ResourceModel/Optimizer/Config/Attributes/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ public function __construct(
7070
ManagerInterface $eventManager,
7171
Config $eavConfig,
7272
EavEntityFactory $eavEntityFactory,
73-
AdapterInterface $connection = null,
74-
AbstractDb $resource = null,
73+
?AdapterInterface $connection = null,
74+
?AbstractDb $resource = null,
7575
$availableBackendTypes = [],
7676
$nestedFieldAttributes = []
7777
) {

‎src/module-elasticsuite-catalog-rule/Api/Data/ConditionInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function getConditions();
5454
*
5555
* @return $this
5656
*/
57-
public function setConditions(array $conditions = null);
57+
public function setConditions(?array $conditions = null);
5858

5959
/**
6060
* Return the aggregator type

‎src/module-elasticsuite-catalog-rule/Model/Data/Condition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function getConditions()
6060
/**
6161
* {@inheritDoc}
6262
*/
63-
public function setConditions(array $conditions = null)
63+
public function setConditions(?array $conditions = null)
6464
{
6565
return $this->setData(self::KEY_CONDITIONS, $conditions);
6666
}

‎src/module-elasticsuite-catalog/Model/Product/Indexer/Fulltext/Datasource/AttributeData.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function __construct(
7272
AttributeHelper $attributeHelper,
7373
array $indexedBackendModels = [],
7474
array $forbiddenChildrenAttributes = [],
75-
ScopeConfigInterface $scopeConfig = null
75+
?ScopeConfigInterface $scopeConfig = null
7676
) {
7777
parent::__construct($resourceModel, $fieldFactory, $attributeHelper, $indexedBackendModels);
7878

‎src/module-elasticsuite-catalog/Model/Product/Indexer/Fulltext/Datasource/PriceData.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function __construct(
7373
ResourceModel $resourceModel,
7474
AttributeResourceModel $attributeResourceModel,
7575
$priceReaderPool = [],
76-
ScopeConfigInterface $scopeConfig = null
76+
?ScopeConfigInterface $scopeConfig = null
7777
) {
7878
$this->resourceModel = $resourceModel;
7979
$this->priceReaderPool = $priceReaderPool;

‎src/module-elasticsuite-catalog/Model/ResourceModel/Category/Fulltext/Collection.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Category\Collectio
9090
* @param \Magento\Store\Model\StoreManagerInterface $storeManager Store Manager
9191
* @param \Smile\ElasticsuiteCore\Search\Request\Builder $requestBuilder Search request builder.
9292
* @param \Magento\Search\Model\SearchEngine $searchEngine Search engine
93-
* @param \Magento\Framework\DB\Adapter\AdapterInterface $connection Db Connection.
93+
* @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection Db Connection.
9494
* @param string $searchRequestName Search request name.
9595
*/
9696
public function __construct(
@@ -106,8 +106,8 @@ public function __construct(
106106
\Magento\Store\Model\StoreManagerInterface $storeManager,
107107
\Smile\ElasticsuiteCore\Search\Request\Builder $requestBuilder,
108108
\Magento\Search\Model\SearchEngine $searchEngine,
109-
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
110-
$searchRequestName = 'category_search_container'
109+
?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
110+
string $searchRequestName = 'category_search_container'
111111
) {
112112
parent::__construct(
113113
$entityFactory,

‎src/module-elasticsuite-catalog/Model/ResourceModel/Product/Fulltext/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ public function __construct(
154154
\Smile\ElasticsuiteCore\Search\Request\Builder $requestBuilder,
155155
\Magento\Search\Model\SearchEngine $searchEngine,
156156
RequestFieldMapper $requestFieldMapper,
157-
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
158-
$searchRequestName = 'catalog_view_container'
157+
?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
158+
string $searchRequestName = 'catalog_view_container'
159159
) {
160160
parent::__construct(
161161
$entityFactory,

‎src/module-elasticsuite-catalog/Plugin/Catalog/Controller/Adminhtml/Category/SavePlugin.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function __construct(array $stringToBoolInputs = [])
5252
*
5353
* @return array
5454
*/
55-
public function afterStringToBoolConverting(Save $subject, array $result, array $data, array $stringToBoolInputs = null)
55+
public function afterStringToBoolConverting(Save $subject, array $result, array $data, ?array $stringToBoolInputs = null)
5656
{
5757
return $this->stringToBoolConverting($result);
5858
}
@@ -63,12 +63,12 @@ public function afterStringToBoolConverting(Save $subject, array $result, array
6363
*
6464
* @SuppressWarnings(PHPMD.ElseExpression)
6565
*
66-
* @param array $data The data
67-
* @param array $stringToBoolInputs The inputs
66+
* @param array $data The data.
67+
* @param array|null $stringToBoolInputs The inputs.
6868
*
69-
* @return mixed
69+
* @return array
7070
*/
71-
private function stringToBoolConverting($data, array $stringToBoolInputs = null)
71+
private function stringToBoolConverting($data, ?array $stringToBoolInputs = null)
7272
{
7373
if (null === $stringToBoolInputs) {
7474
$stringToBoolInputs = $this->stringToBoolInputs;

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ public function getIdField();
7272
/**
7373
* Return array of indexed by mapping properties used in search and weight as values.
7474
*
75-
* @param string|NULL $analyzer Search analyzer.
76-
* @param string|NULL $defaultField Default field added to the list of fields.
77-
* All field weighted with 1 will be ignored if present.
78-
* @param integer $boost A multiplier applied to fields default weight.
79-
* @param FieldFilterInterface $fieldFilter A filter applied to fields.
75+
* @param string|NULL $analyzer Search analyzer.
76+
* @param string|NULL $defaultField Default field added to the list of fields.
77+
* All field weighted with 1 will be ignored if present.
78+
* @param integer $boost A multiplier applied to fields default weight.
79+
* @param FieldFilterInterface|null $fieldFilter A filter applied to fields.
8080
*
8181
* @return float[]
8282
*/
8383
public function getWeightedSearchProperties(
84-
$analyzer = null,
85-
$defaultField = null,
86-
$boost = 1,
87-
FieldFilterInterface $fieldFilter = null
84+
?string $analyzer = null,
85+
?string $defaultField = null,
86+
int $boost = 1,
87+
?FieldFilterInterface $fieldFilter = null
8888
);
8989

9090
/**

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ public function getIdField()
165165
* {@inheritDoc}
166166
*/
167167
public function getWeightedSearchProperties(
168-
$analyzer = null,
169-
$defaultField = null,
170-
$boost = 1,
171-
FieldFilterInterface $fieldFilter = null
168+
?string $analyzer = null,
169+
?string $defaultField = null,
170+
int $boost = 1,
171+
?FieldFilterInterface $fieldFilter = null
172172
) {
173173
$weightedFields = [];
174174
$fields = $this->getFields();

‎src/module-elasticsuite-core/Model/ProductMetadata.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ class ProductMetadata
7575
*
7676
* @param ComposerInformationProvider $composerInformationProvider Composer Information provider
7777
* @param string $packageName Self package name
78-
* @param CacheInterface $cache Cache interface
78+
* @param CacheInterface|null $cache Cache interface
7979
*/
8080
public function __construct(
8181
ComposerInformationProvider $composerInformationProvider,
8282
string $packageName = 'smile/elasticsuite',
83-
CacheInterface $cache = null
83+
?CacheInterface $cache = null
8484
) {
8585
$this->composerInformationProvider = $composerInformationProvider;
8686
$this->packageName = $packageName;

‎src/module-elasticsuite-core/Model/ResourceModel/Search/Request/RelevanceConfig/Data/Collection/Scoped.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public function __construct(
6060
ManagerInterface $eventManager,
6161
Data $resource,
6262
$scope,
63-
AdapterInterface $connection = null,
64-
$scopeCode = null
63+
?AdapterInterface $connection = null,
64+
?string $scopeCode = null
6565
) {
6666
$this->scope = $scope;
6767
$this->scopeCode = $scopeCode;

‎src/module-elasticsuite-core/Search/Request.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,29 +73,29 @@ class Request extends \Magento\Framework\Search\Request implements RequestInterf
7373
* @param string $name Search request name.
7474
* @param string $indexName Index name.
7575
* @param QueryInterface $query Search query.
76-
* @param QueryInterface $filter Search filter.
76+
* @param QueryInterface|null $filter Search filter.
7777
* @param SortOrderInterface[] $sortOrders Sort orders specification.
7878
* @param int|null $from Pagination from clause.
7979
* @param int|null $size Pagination page size clause.
8080
* @param Dimension[] $dimensions Searched store.
8181
* @param BucketInterface[] $buckets Search request aggregations definition.
82-
* @param string $spellingType For fulltext query : the type of spellchecked applied.
83-
* @param bool|int $trackTotalHits Value of the 'track_total_hits' ES parameter.
84-
* @param bool|int $minScore Value of the 'min_score' ES parameter.
82+
* @param string|null $spellingType For fulltext query : the type of spellchecked applied.
83+
* @param bool|int|null $trackTotalHits Value of the 'track_total_hits' ES parameter.
84+
* @param bool|int|null $minScore Value of the 'min_score' ES parameter.
8585
*/
8686
public function __construct(
87-
$name,
88-
$indexName,
87+
string $name,
88+
string $indexName,
8989
QueryInterface $query,
90-
QueryInterface $filter = null,
91-
array $sortOrders = null,
92-
$from = null,
93-
$size = null,
90+
?QueryInterface $filter = null,
91+
?array $sortOrders = null,
92+
?int $from = null,
93+
?int $size = null,
9494
array $dimensions = [],
9595
array $buckets = [],
96-
$spellingType = null,
97-
$trackTotalHits = null,
98-
$minScore = null
96+
?string $spellingType = null,
97+
bool|int|null $trackTotalHits = null,
98+
bool|int|null $minScore = null
9999
) {
100100
parent::__construct($name, $indexName, $query, $from, $size, $dimensions, $buckets);
101101
$this->filter = $filter;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,19 @@ abstract class AbstractBucket implements BucketInterface
7575
* @param MetricInterface[] $metrics Bucket metrics.
7676
* @param BucketInterface[] $childBuckets Child buckets.
7777
* @param PipelineInterface[] $pipelines Bucket pipelines.
78-
* @param string $nestedPath Nested path for nested bucket.
79-
* @param QueryInterface $filter Bucket filter.
80-
* @param QueryInterface $nestedFilter Nested filter for the bucket.
78+
* @param string|null $nestedPath Nested path for nested bucket.
79+
* @param QueryInterface|null $filter Bucket filter.
80+
* @param QueryInterface|null $nestedFilter Nested filter for the bucket.
8181
*/
8282
public function __construct(
83-
$name,
84-
$field,
83+
string $name,
84+
string $field,
8585
array $metrics = [],
8686
array $childBuckets = [],
8787
array $pipelines = [],
88-
$nestedPath = null,
89-
QueryInterface $filter = null,
90-
QueryInterface $nestedFilter = null
88+
?string $nestedPath = null,
89+
?QueryInterface $filter = null,
90+
?QueryInterface $nestedFilter = null
9191
) {
9292
$this->name = $name;
9393
$this->field = $field;

0 commit comments

Comments
 (0)