File tree Expand file tree Collapse file tree 1 file changed +8
-2
lines changed
lib/internal/Magento/Framework/Module Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -71,14 +71,20 @@ public function checkConflictsWhenEnableModules($moduleNames)
71
71
private function checkIfConflict ($ moduleA , $ moduleB )
72
72
{
73
73
$ versionParser = new VersionParser ();
74
- if (isset ($ this ->packageInfo ->getConflict ($ moduleB )[$ moduleA ]) && $ this ->packageInfo ->getVersion ($ moduleA )) {
74
+ if (isset ($ this ->packageInfo ->getConflict ($ moduleB )[$ moduleA ]) &&
75
+ $ this ->packageInfo ->getConflict ($ moduleB )[$ moduleA ] &&
76
+ $ this ->packageInfo ->getVersion ($ moduleA )
77
+ ) {
75
78
$ constraintA = $ versionParser ->parseConstraints ($ this ->packageInfo ->getConflict ($ moduleB )[$ moduleA ]);
76
79
$ constraintB = $ versionParser ->parseConstraints ($ this ->packageInfo ->getVersion ($ moduleA ));
77
80
if ($ constraintA ->matches ($ constraintB )) {
78
81
return true ;
79
82
}
80
83
}
81
- if (isset ($ this ->packageInfo ->getConflict ($ moduleA )[$ moduleB ]) && $ this ->packageInfo ->getVersion ($ moduleB )) {
84
+ if (isset ($ this ->packageInfo ->getConflict ($ moduleA )[$ moduleB ]) &&
85
+ $ this ->packageInfo ->getConflict ($ moduleA )[$ moduleB ] &&
86
+ $ this ->packageInfo ->getVersion ($ moduleB )
87
+ ) {
82
88
$ constraintA = $ versionParser ->parseConstraints ($ this ->packageInfo ->getConflict ($ moduleA )[$ moduleB ]);
83
89
$ constraintB = $ versionParser ->parseConstraints ($ this ->packageInfo ->getVersion ($ moduleB ));
84
90
if ($ constraintA ->matches ($ constraintB )) {
You can’t perform that action at this time.
0 commit comments