Skip to content

Commit

Permalink
MAGETWO-80225: Show different message if DB module version is higher …
Browse files Browse the repository at this point in the history
…than code module #11064

- changed wording of the error
  • Loading branch information
vrann committed Sep 27, 2017
1 parent e05ea6a commit db7148e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ private function formatVersionTooHighErrors($errorsData)
$formattedErrors = [];

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

return $formattedErrors;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ public static function beforeDispatchOutOfDateWithErrorsDataProvider()
'expectedMessage' => "Please update your modules: "
. "Run \"composer install\" from the Magento root directory.\n"
. "The following modules are outdated:\n"
. "Magento_Module3 schema: code version - 1.0.0, database version - 2.0.0\n"
. "Magento_Module4 data: code version - 1.0.0, database version - 1.0.1",
. "Magento_Module3 db schema version: defined in codebase - 1.0.0, currently installed - 2.0.0\n"
. "Magento_Module4 db data version: defined in codebase - 1.0.0, currently installed - 1.0.1",
],
'some versions too high, some too low' => [
'errors' => [
Expand All @@ -182,7 +182,7 @@ public static function beforeDispatchOutOfDateWithErrorsDataProvider()
'expectedMessage' => "Please update your modules: "
. "Run \"composer install\" from the Magento root directory.\n"
. "The following modules are outdated:\n"
. "Magento_Module1 schema: code version - 1.0.0, database version - 2.0.0"
. "Magento_Module1 db schema version: defined in codebase - 1.0.0, currently installed - 2.0.0"
]
];
}
Expand Down

0 comments on commit db7148e

Please sign in to comment.