Skip to content

Commit 3a7c067

Browse files
eddielauOlga Kopylova
authored andcommitted
MAGETWO-33157: Conflict restriction checking is missing version checking in enable/disable module CLI
- corrected code style
1 parent 514992e commit 3a7c067

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

dev/tests/unit/testsuite/Magento/Framework/Module/ConflictCheckerTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ public function checkConflictWhenEnableModuleDataProvider()
9191
[['Vendor_A', []], ['Vendor_B', ['Vendor_C' => '0.1']], ['Vendor_C', []]],
9292
['Vendor_A'],
9393
['Vendor_B', 'Vendor_C'],
94-
['Vendor_B' => ['Vendor_B conflicts with Vendor_C version 0.1 (current 0.1)'], 'Vendor_C' => ['Vendor_B conflicts with Vendor_C version 0.1 (current 0.1)']]
94+
[
95+
'Vendor_B' => ['Vendor_B conflicts with Vendor_C version 0.1 (current 0.1)'],
96+
'Vendor_C' => ['Vendor_B conflicts with Vendor_C version 0.1 (current 0.1)']
97+
]
9598
],
9699
[
97100
[['Vendor_A', ['Vendor_B' => '>=0.1']], ['Vendor_B', []]],
@@ -103,7 +106,7 @@ public function checkConflictWhenEnableModuleDataProvider()
103106
[['Vendor_A', ['Vendor_B' => '~0.1']], ['Vendor_B', []]],
104107
['Vendor_A'],
105108
['Vendor_B'],
106-
['Vendor_B' => ['Vendor_A conflicts with Vendor_B version ~0.1 (current 0.1)']]
109+
['Vendor_B' => ['Vendor_A conflicts with Vendor_B version ~0.1 (current 0.1)']]
107110
],
108111
];
109112
}

0 commit comments

Comments
 (0)