File tree Expand file tree Collapse file tree 2 files changed +8
-10
lines changed
src/Config/Validator/Deploy Expand file tree Collapse file tree 2 files changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -79,13 +79,12 @@ public function validate(): Validator\ResultInterface
79
79
return $ this ->resultFactory ->success ();
80
80
}
81
81
82
+ $ modules = $ this ->reader ->read ()['modules ' ] ?? [];
83
+ $ liveSearchEnabled = $ modules ['Magento_LiveSearchAdapter ' ] ?? false ;
84
+
82
85
if ($ this ->magentoVersion ->isGreaterOrEqual ('2.4.0 ' )
83
- && !$ this ->elasticsearch ->isInstalled ()
86
+ && !$ this ->elasticsearch ->isInstalled () && ! $ liveSearchEnabled
84
87
) {
85
- $ modules = $ this ->reader ->read ()['modules ' ] ?? [];
86
- if (isset ($ modules ['Magento_LiveSearchAdapter ' ]) && $ modules ['Magento_LiveSearchAdapter ' ]) {
87
- return $ this ->resultFactory ->success ();
88
- }
89
88
return $ this ->resultFactory ->errorByCode (Error::DEPLOY_ES_SERVICE_NOT_INSTALLED );
90
89
}
91
90
} catch (UndefinedPackageException | FileSystemException $ exception ) {
Original file line number Diff line number Diff line change @@ -86,13 +86,12 @@ public function validate(): Validator\ResultInterface
86
86
return $ this ->resultFactory ->errorByCode (Error::DEPLOY_MAGENTO_VERSION_DOES_NOT_SUPPORT_OS );
87
87
}
88
88
89
+ $ modules = $ this ->reader ->read ()['modules ' ] ?? [];
90
+ $ liveSearchEnabled = $ modules ['Magento_LiveSearchAdapter ' ] ?? false ;
91
+
89
92
if ($ this ->magentoVersion ->isGreaterOrEqual ('2.4.3-p2 ' )
90
- && !$ this ->openSearch ->isInstalled ()
93
+ && !$ this ->openSearch ->isInstalled () && ! $ liveSearchEnabled
91
94
) {
92
- $ modules = $ this ->reader ->read ()['modules ' ] ?? [];
93
- if (isset ($ modules ['Magento_LiveSearchAdapter ' ]) && $ modules ['Magento_LiveSearchAdapter ' ]) {
94
- return $ this ->resultFactory ->success ();
95
- }
96
95
return $ this ->resultFactory ->errorByCode (Error::DEPLOY_OS_SERVICE_NOT_INSTALLED );
97
96
}
98
97
} catch (UndefinedPackageException | FileSystemException $ exception ) {
You can’t perform that action at this time.
0 commit comments