@@ -22,11 +22,6 @@ class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
22
22
*/
23
23
private $ dependencyProvider ;
24
24
25
- /**
26
- * @var array
27
- */
28
- private $ blacklistedDependencies = [];
29
-
30
25
/**
31
26
* Sets up data
32
27
*
@@ -50,14 +45,6 @@ protected function setUp()
50
45
*/
51
46
public function testUndeclaredDependencies ()
52
47
{
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
-
61
48
$ invoker = new \Magento \Framework \App \Utility \AggregateInvoker ($ this );
62
49
$ invoker (
63
50
/**
@@ -84,9 +71,6 @@ function ($file) {
84
71
$ result = [];
85
72
foreach ($ undeclaredDependency as $ name => $ modules ) {
86
73
$ modules = array_unique ($ modules );
87
- if ($ this ->filterBlacklistedDependencies ($ foundModuleName , $ modules )) {
88
- $ result [] = $ this ->getErrorMessage ($ name ) . "\n" . implode ("\t\n" , $ modules ) . "\n" ;
89
- }
90
74
}
91
75
if (!empty ($ result )) {
92
76
$ this ->fail (
@@ -98,24 +82,6 @@ function ($file) {
98
82
);
99
83
}
100
84
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
-
119
85
/**
120
86
* Convert file list to data provider structure.
121
87
*
0 commit comments