Skip to content

Commit b50dbca

Browse files
committed
MC-15534: [MSI] Remove blacklisted dependency
1 parent a7d2194 commit b50dbca

File tree

2 files changed

+0
-43
lines changed

2 files changed

+0
-43
lines changed

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

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
2222
*/
2323
private $dependencyProvider;
2424

25-
/**
26-
* @var array
27-
*/
28-
private $blacklistedDependencies = [];
29-
3025
/**
3126
* Sets up data
3227
*
@@ -50,14 +45,6 @@ protected function setUp()
5045
*/
5146
public function testUndeclaredDependencies()
5247
{
53-
/** TODO: Remove this temporary solution after MC-15534 is closed */
54-
$filePattern = __DIR__ . '/_files/dependency_test/blacklisted_dependencies_*.php';
55-
$blacklistedDependencies = [];
56-
foreach (glob($filePattern) as $fileName) {
57-
$blacklistedDependencies = array_merge($blacklistedDependencies, require $fileName);
58-
}
59-
$this->blacklistedDependencies = $blacklistedDependencies;
60-
6148
$invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
6249
$invoker(
6350
/**
@@ -84,9 +71,6 @@ function ($file) {
8471
$result = [];
8572
foreach ($undeclaredDependency as $name => $modules) {
8673
$modules = array_unique($modules);
87-
if ($this->filterBlacklistedDependencies($foundModuleName, $modules)) {
88-
$result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules) . "\n";
89-
}
9074
}
9175
if (!empty($result)) {
9276
$this->fail(
@@ -98,24 +82,6 @@ function ($file) {
9882
);
9983
}
10084

101-
/**
102-
* Filter blacklisted dependencies.
103-
*
104-
* @todo Remove this temporary solution after MC-15534 is closed
105-
*
106-
* @param string $moduleName
107-
* @param array $dependencies
108-
* @return array
109-
*/
110-
private function filterBlacklistedDependencies(string $moduleName, array $dependencies): array
111-
{
112-
if (!empty($this->blacklistedDependencies[$moduleName])) {
113-
$dependencies = array_diff($dependencies, $this->blacklistedDependencies[$moduleName]);
114-
}
115-
116-
return $dependencies;
117-
}
118-
11985
/**
12086
* Convert file list to data provider structure.
12187
*

dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/blacklisted_dependencies_ce.php

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)