Skip to content
Snippets Groups Projects
Commit cae01feb authored by ressa's avatar ressa Committed by Adam G-H
Browse files

Issue #3254911 by Theresa.Grannum: Remove "automatic updates" from individual validator messages

parent ad8d167e
No related branches found
No related tags found
No related merge requests found
......@@ -39,7 +39,7 @@ class SettingsValidator implements EventSubscriberInterface {
public function checkSettings(PreOperationStageEvent $event): void {
if ($event->getStage() instanceof Updater && Settings::get('update_fetch_with_http_fallback')) {
$event->addError([
$this->t('The <code>update_fetch_with_http_fallback</code> setting must be disabled for automatic updates.'),
$this->t('The <code>update_fetch_with_http_fallback</code> setting must be disabled.'),
]);
}
}
......
......@@ -32,7 +32,7 @@ class StableReleaseInstalled {
if ($extra) {
return [
$this->t('Drupal cannot be automatically updated during cron from its current version, @installed_version, because Automatic Updates only supports updating from stable versions during cron.', [
$this->t('Drupal cannot be automatically updated during cron from its current version, @installed_version, because it is not a stable version.', [
'@installed_version' => $installed_version,
]),
];
......
......@@ -34,7 +34,7 @@ class TargetVersionStable {
if ($extra) {
return [
$this->t('Drupal cannot be automatically updated during cron to @target_version, because Automatic Updates only supports updating to stable versions during cron.', [
$this->t('Drupal cannot be automatically updated during cron to the recommended version, @target_version, because it is not a stable version.', [
'@target_version' => $target_version,
]),
];
......
......@@ -26,7 +26,7 @@ class XdebugValidator implements EventSubscriberInterface {
public function checkForXdebug(ReadinessCheckEvent $event): void {
if (extension_loaded('xdebug')) {
$event->addWarning([
$this->t('Xdebug is enabled, which may cause timeout errors during automatic updates.'),
$this->t('Xdebug is enabled, which may cause timeout errors.'),
]);
}
}
......
......@@ -25,9 +25,7 @@ class SettingsValidatorTest extends AutomaticUpdatesKernelTestBase {
* Sets of arguments to pass to the test method.
*/
public function providerSettingsValidation(): array {
$result = ValidationResult::createError([
'The <code>update_fetch_with_http_fallback</code> setting must be disabled for automatic updates.',
]);
$result = ValidationResult::createError(['The <code>update_fetch_with_http_fallback</code> setting must be disabled.']);
return [
'HTTP fallback enabled' => [TRUE, [$result]],
......
......@@ -77,7 +77,7 @@ class VersionPolicyValidatorTest extends AutomaticUpdatesKernelTestBase {
[CronUpdater::SECURITY, CronUpdater::ALL],
[
$this->createValidationResult('9.8.0-alpha1', '9.8.1', [
'Drupal cannot be automatically updated during cron from its current version, 9.8.0-alpha1, because Automatic Updates only supports updating from stable versions during cron.',
'Drupal cannot be automatically updated during cron from its current version, 9.8.0-alpha1, because it is not a stable version.',
]),
],
],
......@@ -93,7 +93,7 @@ class VersionPolicyValidatorTest extends AutomaticUpdatesKernelTestBase {
[CronUpdater::SECURITY, CronUpdater::ALL],
[
$this->createValidationResult('9.8.0-beta2', '9.8.1', [
'Drupal cannot be automatically updated during cron from its current version, 9.8.0-beta2, because Automatic Updates only supports updating from stable versions during cron.',
'Drupal cannot be automatically updated during cron from its current version, 9.8.0-beta2, because it is not a stable version.',
]),
],
],
......@@ -109,7 +109,7 @@ class VersionPolicyValidatorTest extends AutomaticUpdatesKernelTestBase {
[CronUpdater::SECURITY, CronUpdater::ALL],
[
$this->createValidationResult('9.8.0-rc3', '9.8.1', [
'Drupal cannot be automatically updated during cron from its current version, 9.8.0-rc3, because Automatic Updates only supports updating from stable versions during cron.',
'Drupal cannot be automatically updated during cron from its current version, 9.8.0-rc3, because it is not a stable version.',
]),
],
],
......@@ -353,7 +353,7 @@ class VersionPolicyValidatorTest extends AutomaticUpdatesKernelTestBase {
['drupal' => '9.8.1-beta1'],
[
$this->createValidationResult('9.8.0', '9.8.1-beta1', [
'Drupal cannot be automatically updated during cron to 9.8.1-beta1, because Automatic Updates only supports updating to stable versions during cron.',
'Drupal cannot be automatically updated during cron to the recommended version, 9.8.1-beta1, because it is not a stable version.',
]),
],
],
......
......@@ -29,15 +29,15 @@ class StableReleaseInstalledTest extends UnitTestCase {
],
'alpha version installed' => [
'9.8.0-alpha3',
['Drupal cannot be automatically updated during cron from its current version, 9.8.0-alpha3, because Automatic Updates only supports updating from stable versions during cron.'],
['Drupal cannot be automatically updated during cron from its current version, 9.8.0-alpha3, because it is not a stable version.'],
],
'beta version installed' => [
'9.8.0-beta7',
['Drupal cannot be automatically updated during cron from its current version, 9.8.0-beta7, because Automatic Updates only supports updating from stable versions during cron.'],
['Drupal cannot be automatically updated during cron from its current version, 9.8.0-beta7, because it is not a stable version.'],
],
'release candidate installed' => [
'9.8.0-rc2',
['Drupal cannot be automatically updated during cron from its current version, 9.8.0-rc2, because Automatic Updates only supports updating from stable versions during cron.'],
['Drupal cannot be automatically updated during cron from its current version, 9.8.0-rc2, because it is not a stable version.'],
],
];
}
......
......@@ -29,19 +29,19 @@ class TargetVersionStableTest extends UnitTestCase {
],
'dev target version' => [
'9.9.0-dev',
['Drupal cannot be automatically updated during cron to 9.9.0-dev, because Automatic Updates only supports updating to stable versions during cron.'],
['Drupal cannot be automatically updated during cron to the recommended version, 9.9.0-dev, because it is not a stable version.'],
],
'alpha target version' => [
'9.9.0-alpha3',
['Drupal cannot be automatically updated during cron to 9.9.0-alpha3, because Automatic Updates only supports updating to stable versions during cron.'],
['Drupal cannot be automatically updated during cron to the recommended version, 9.9.0-alpha3, because it is not a stable version.'],
],
'beta target version' => [
'9.9.0-beta7',
['Drupal cannot be automatically updated during cron to 9.9.0-beta7, because Automatic Updates only supports updating to stable versions during cron.'],
['Drupal cannot be automatically updated during cron to the recommended version, 9.9.0-beta7, because it is not a stable version.'],
],
'release candidate target version' => [
'9.9.0-rc2',
['Drupal cannot be automatically updated during cron to 9.9.0-rc2, because Automatic Updates only supports updating to stable versions during cron.'],
['Drupal cannot be automatically updated during cron to the recommended version, 9.9.0-rc2, because it is not a stable version.'],
],
];
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment