Skip to content

Commit 4f495b7

Browse files
committed
[Core] Fixing PHPUnit deprecations (dataProvider annotations)
1 parent 31428b9 commit 4f495b7

11 files changed

Lines changed: 30 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*/
1414
namespace Smile\ElasticsuiteCatalogOptimizer\Test\Unit\Model\Optimizer;
1515

16+
use PHPUnit\Framework\Attributes\DataProvider;
1617
use PHPUnit\Framework\MockObject\MockObject;
1718
use PHPUnit\Framework\TestCase;
1819
use ReflectionClass;
@@ -130,6 +131,7 @@ protected function setUp(): void
130131
* @param integer $category Category
131132
* @param boolean $expectedResult Expected result
132133
*/
134+
#[DataProvider('dataProvider')]
133135
public function testCanApply(
134136
$searchContainers,
135137
$name,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
namespace Smile\ElasticsuiteCatalog\Test\Unit\Helper;
1616

17+
use PHPUnit\Framework\Attributes\DataProvider;
1718
use Smile\ElasticsuiteCore\Api\Index\Mapping\FieldInterface;
1819
use Smile\ElasticsuiteCatalog\Helper\AbstractAttribute;
1920
use Smile\ElasticsuiteCore\Api\Index\MappingInterface;
@@ -42,6 +43,7 @@ class AbstractAttributeTest extends \PHPUnit\Framework\TestCase
4243
*
4344
* @return void
4445
*/
46+
#[DataProvider('attributeTypeProvider')]
4547
public function testFieldTypes($attributeId, $backendType, $usesSource, $sourceModel, $frontendClass, $expectedType)
4648
{
4749
$contextMock = $this->createMock(\Magento\Framework\App\Helper\Context::class);

src/module-elasticsuite-core/Test/Unit/Helper/IndexSettingsTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Magento\Framework\App\Config\ScopeConfigInterface;
1717
use Magento\Framework\App\Helper\Context;
1818
use Magento\Store\Model\StoreManagerInterface;
19+
use PHPUnit\Framework\Attributes\DataProvider;
1920
use PHPUnit\Framework\TestCase;
2021
use Smile\ElasticsuiteCore\Helper\IndexSettings as IndexSettingsHelper;
2122
use Smile\ElasticsuiteCore\Index\Indices\Config as IndicesConfig;
@@ -43,6 +44,7 @@ class IndexSettingsTest extends TestCase
4344
*
4445
* @return void
4546
*/
47+
#[DataProvider('parseIndexNameDataProvider')]
4648
public function testParseIndexName(string $indexName, string $alias, string $suffixPattern, $expected)
4749
{
4850
$scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)->disableOriginalConstructor()->getMock();
@@ -96,7 +98,7 @@ public function testParseIndexName(string $indexName, string $alias, string $suf
9698
*
9799
* @return iterable
98100
*/
99-
public static function parseIndexNameDataProvider(): iterable
101+
public function parseIndexNameDataProvider(): iterable
100102
{
101103
yield [
102104
'magento2_default_catalog_product_20250707_093823',

src/module-elasticsuite-core/Test/Unit/Index/Indices/ConfigTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace Smile\ElasticsuiteCore\Test\Unit\Index\Indices;
1515

16+
use PHPUnit\Framework\Attributes\DataProvider;
1617
use Magento\Framework\Config\CacheInterface;
1718
use Magento\Framework\Serialize\SerializerInterface;
1819
use Smile\ElasticsuiteCore\Index\Indices\Config\Converter;
@@ -59,6 +60,7 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
5960
*
6061
* @return void
6162
*/
63+
#[DataProvider('stringFieldDynamicConfigProvider')]
6264
public function testConfig($stringFieldDynamicConfig)
6365
{
6466
$config = new Config(

src/module-elasticsuite-core/Test/Unit/Index/Mapping/FieldTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*/
1414
namespace Smile\ElasticsuiteCore\Test\Unit\Index\Mapping;
1515

16+
use PHPUnit\Framework\Attributes\DataProvider;
1617
use Smile\ElasticsuiteCore\Index\Mapping\Field;
1718
use Smile\ElasticsuiteCore\Api\Index\Mapping\FieldInterface;
1819
use Smile\ElasticsuiteCore\Search\Request\SortOrderInterface;
@@ -166,6 +167,7 @@ public function testSimpleSearchableStringField()
166167
* @param bool $isSearchable Expected result for is_searchable property
167168
* @param bool $isUsedInSpellcheck Expected result for is_used_in_spellcheck property
168169
*/
170+
#[DataProvider('getIsUsedInSpellcheckFieldConfigDataProvider')]
169171
public function testIsUsedInSpellcheckField($fieldConfig, $isSearchable, $isUsedInSpellcheck)
170172
{
171173
$fieldType = FieldInterface::FIELD_TYPE_TEXT;
@@ -237,6 +239,7 @@ public function testTokenCountField()
237239
* @param int $searchWeight Expected result for search_weight property
238240
* @param string $defaultAnalyzer Expected result for default_search_analyzer property
239241
*/
242+
#[DataProvider('getMergeConfigFieldConfigDataProvider')]
240243
public function testMergeConfig(
241244
$fieldConfig,
242245
$config,

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*/
1414
namespace Smile\ElasticsuiteCore\Test\Unit\Model;
1515

16+
use PHPUnit\Framework\Attributes\DataProvider;
1617
use Smile\ElasticsuiteCore\Api\Search\ContextInterface;
1718

1819
/**
@@ -28,13 +29,14 @@ class SearchTest extends \PHPUnit\Framework\TestCase
2829
/**
2930
* Test search response format.
3031
*
31-
* @dataProvider dataprovider
32+
* @dataProvider dataProvider
3233
*
33-
* @param unknown $documents Search engine hits.
34-
* @param unknown $docCount Total number of docs that match the search.
34+
* @param array $documents Search engine hits.
35+
* @param int $docCount Total number of docs that match the search.
3536
*
3637
* @return void.
3738
*/
39+
#[DataProvider('dataProvider')]
3840
public function testSearch($documents, $docCount)
3941
{
4042
$searchEngine = $this->getSearchEngine($documents, $docCount);

src/module-elasticsuite-core/Test/Unit/Search/Adapter/Elasticsuite/Request/Aggregation/Builder/TermTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*/
1414
namespace Smile\ElasticsuiteCore\Test\Unit\Search\Adapter\Elasticsuite\Request\Aggregation\Builder;
1515

16+
use PHPUnit\Framework\Attributes\DataProvider;
1617
use Smile\ElasticsuiteCore\Search\Adapter\Elasticsuite\Request\Aggregation\Builder\Term as TermBuilder;
1718
use Smile\ElasticsuiteCore\Search\Request\Aggregation\Bucket\Term as TermBucket;
1819
use Smile\ElasticsuiteCore\Search\Request\SortOrderInterface;
@@ -242,6 +243,7 @@ public function testInvalidBucketAggregationBuild()
242243
*
243244
* @return void
244245
*/
246+
#[DataProvider('sizeDataProvider')]
245247
public function testBucketSize($size, $expected)
246248
{
247249
$aggBuilder = $this->getAggregationBuilder();

src/module-elasticsuite-core/Test/Unit/Search/Adapter/Elasticsuite/Request/Aggregation/Builder/TopHitsTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace Smile\ElasticsuiteCore\Test\Unit\Search\Adapter\Elasticsuite\Request\Aggregation\Builder;
1515

16+
use PHPUnit\Framework\Attributes\DataProvider;
1617
use Smile\ElasticsuiteCore\Search\Adapter\Elasticsuite\Request\Aggregation\Builder\TopHits as TopHitsBuilder;
1718
use Smile\ElasticsuiteCore\Search\Request\Aggregation\Bucket\Term as TermBucket;
1819
use Smile\ElasticsuiteCore\Search\Request\Aggregation\Bucket\TopHits as TopHitsBucket;
@@ -40,6 +41,7 @@ class TopHitsTest extends \PHPUnit\Framework\TestCase
4041
*
4142
* @return void
4243
*/
44+
#[DataProvider('sizeDataProvider')]
4345
public function testBucketNoSize($size, $hasSize, $expected)
4446
{
4547
$aggBuilder = $this->getAggregationBuilder();

src/module-elasticsuite-core/Test/Unit/Search/Adapter/Elasticsuite/Request/Query/Builder/NeuralTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*/
1414
namespace Smile\ElasticsuiteCore\Test\Unit\Search\Adapter\Elasticsuite\Request\Query\Builder;
1515

16+
use PHPUnit\Framework\Attributes\DataProvider;
1617
use Smile\ElasticsuiteCore\Search\Request\Query\Vector\Opensearch\Neural as NeuralQuery;
1718
use Smile\ElasticsuiteCore\Search\Adapter\Elasticsuite\Request\Query\Builder\Opensearch\Neural as NeuralQueryBuilder;
1819

@@ -33,6 +34,7 @@ class NeuralTest extends AbstractSimpleQueryBuilder
3334
*
3435
* @return void
3536
*/
37+
#[DataProvider('neuralQueryAssemblerDataProvider')]
3638
public function testNeuralQueryAssembler(
3739
array $queryParameters,
3840
array $expectedQuery,

src/module-elasticsuite-thesaurus/Test/Unit/Config/ThesaurusCacheConfigTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
namespace Smile\ElasticsuiteThesaurus\Test\Unit\Config;
1717

1818
use Magento\Framework\App\Config\ScopeConfigInterface;
19+
use PHPUnit\Framework\Attributes\DataProvider;
1920
use Magento\Store\Model\ScopeInterface;
2021
use PHPUnit\Framework\MockObject\MockObject;
2122
use Smile\ElasticsuiteCore\Api\Search\Request\ContainerConfigurationInterface;
@@ -40,6 +41,7 @@ class ThesaurusCacheConfigTest extends \PHPUnit\Framework\TestCase
4041
* @param int $rewritesCount Number of rewrites/alternative queries.
4142
* @param bool $expectedCacheStorageAllowed Expected cache storage allowed result.
4243
*/
44+
#[DataProvider('cacheStorageLimitationDataProvider')]
4345
public function testCacheStorageLimitation(
4446
$isSetFlagReturnsMap,
4547
$getValueReturnsMap,

0 commit comments

Comments
 (0)