Skip to content

Commit db7148e

Browse files
committed
MAGETWO-80225: Show different message if DB module version is higher than code module #11064
- changed wording of the error
1 parent e05ea6a commit db7148e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ private function formatVersionTooHighErrors($errorsData)
101101
$formattedErrors = [];
102102

103103
foreach ($errorsData as $error) {
104-
$formattedErrors[] = $error[DbVersionInfo::KEY_MODULE] . ' ' . $error[DbVersionInfo::KEY_TYPE]
105-
. ': code version - ' . $error[DbVersionInfo::KEY_REQUIRED]
106-
. ', database version - ' . $error[DbVersionInfo::KEY_CURRENT];
104+
$formattedErrors[] = $error[DbVersionInfo::KEY_MODULE] . ' db ' . $error[DbVersionInfo::KEY_TYPE]
105+
. ' version: defined in codebase - ' . $error[DbVersionInfo::KEY_REQUIRED]
106+
. ', currently installed - ' . $error[DbVersionInfo::KEY_CURRENT];
107107
}
108108

109109
return $formattedErrors;

lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ public static function beforeDispatchOutOfDateWithErrorsDataProvider()
161161
'expectedMessage' => "Please update your modules: "
162162
. "Run \"composer install\" from the Magento root directory.\n"
163163
. "The following modules are outdated:\n"
164-
. "Magento_Module3 schema: code version - 1.0.0, database version - 2.0.0\n"
165-
. "Magento_Module4 data: code version - 1.0.0, database version - 1.0.1",
164+
. "Magento_Module3 db schema version: defined in codebase - 1.0.0, currently installed - 2.0.0\n"
165+
. "Magento_Module4 db data version: defined in codebase - 1.0.0, currently installed - 1.0.1",
166166
],
167167
'some versions too high, some too low' => [
168168
'errors' => [
@@ -182,7 +182,7 @@ public static function beforeDispatchOutOfDateWithErrorsDataProvider()
182182
'expectedMessage' => "Please update your modules: "
183183
. "Run \"composer install\" from the Magento root directory.\n"
184184
. "The following modules are outdated:\n"
185-
. "Magento_Module1 schema: code version - 1.0.0, database version - 2.0.0"
185+
. "Magento_Module1 db schema version: defined in codebase - 1.0.0, currently installed - 2.0.0"
186186
]
187187
];
188188
}

0 commit comments

Comments
 (0)