Skip to content

Commit f83f1bd

Browse files
committed
SEARCH-1968: Static tests to check for dependency of Elasticsearch modules.
1 parent 4bd485c commit f83f1bd

File tree

3 files changed

+7
-11
lines changed
  • dev/tests/static/testsuite/Magento/Test/Integrity

3 files changed

+7
-11
lines changed

dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
/**
3232
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
3333
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
34+
* @SuppressWarnings(PHPMD.TooManyFields)
3435
*/
3536
class DependencyTest extends \PHPUnit\Framework\TestCase
3637
{
@@ -1252,10 +1253,10 @@ function ($fileType, $file) use ($extensionConflictList, $allowedDependencies) {
12521253
$modulesDependencies = array_merge(...$modules);
12531254

12541255
foreach ($extensionConflictList as $extension => $disabledModules) {
1255-
$foundedModules = \array_unique(array_intersect($modulesDependencies, $disabledModules));
1256-
if (!empty($foundedModules)) {
1256+
$modulesThatMustBeDisabled = \array_unique(array_intersect($modulesDependencies, $disabledModules));
1257+
if (!empty($modulesThatMustBeDisabled)) {
12571258

1258-
foreach ($foundedModules as $foundedModule) {
1259+
foreach ($modulesThatMustBeDisabled as $foundedModule) {
12591260
if (!empty($allowedDependencies[$foundedModule])
12601261
&& \in_array($module, $allowedDependencies[$foundedModule])
12611262
) {
@@ -1270,7 +1271,7 @@ function ($fileType, $file) use ($extensionConflictList, $allowedDependencies) {
12701271
' because it must be disabled when "%s" extension is used.' .
12711272
' See AC-2516 for more details',
12721273
$module,
1273-
\implode(', ', $foundedModules),
1274+
\implode(', ', $modulesThatMustBeDisabled),
12741275
$module,
12751276
$extension
12761277
)
@@ -1297,7 +1298,7 @@ private static function getExtensionConflicts(): array
12971298
foreach (glob($extensionConflictsFilePattern) as $fileName) {
12981299
$extensionConflicts[] = include $fileName;
12991300
}
1300-
self::$extensionConflicts = array_merge([], ...$extensionConflicts);
1301+
self::$extensionConflicts = \array_merge_recursive([], ...$extensionConflicts);
13011302
}
13021303
return self::$extensionConflicts;
13031304
}
@@ -1316,7 +1317,7 @@ private static function getAllowedDependencies(): array
13161317
foreach (glob($allowedDependenciesFilePattern) as $fileName) {
13171318
$allowedDependencies[] = include $fileName;
13181319
}
1319-
self::$allowedDependencies = array_merge([], ...$allowedDependencies);
1320+
self::$allowedDependencies = \array_merge_recursive([], ...$allowedDependencies);
13201321
}
13211322
return self::$allowedDependencies;
13221323
}

dev/tests/static/testsuite/Magento/Test/Integrity/_files/extension_dependencies_test/allowed_dependencies/ce.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,5 @@
1010
'Magento\Elasticsearch',
1111
'Magento\Elasticsearch6',
1212
'Magento\Elasticsearch7',
13-
'Magento\ElasticsearchCatalogPermissions', // move to EE repo
14-
'Magento\ElasticsearchCatalogPermissionsGraphQl', // move to EE repo
1513
]
1614
];

dev/tests/static/testsuite/Magento/Test/Integrity/_files/extension_dependencies_test/extension_conflicts/ce.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,5 @@
1212
'Magento\Elasticsearch',
1313
'Magento\Elasticsearch6',
1414
'Magento\Elasticsearch7',
15-
'Magento\ElasticsearchCatalogPermissions',// move to EE repo
16-
'Magento\ElasticsearchCatalogPermissionsGraphQl', // move to EE repo
17-
'Magento\InventoryElasticSearch', // move to Inventory repo
1815
],
1916
];

0 commit comments

Comments
 (0)