diff --git a/src/Validator/SettingsValidator.php b/src/Validator/SettingsValidator.php index 6da6f14f32276e55243ee44801907685e9d6e4f0..95d8cca7de3af7c93c800746c4e06e6163a9d5e4 100644 --- a/src/Validator/SettingsValidator.php +++ b/src/Validator/SettingsValidator.php @@ -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.'), ]); } } diff --git a/src/Validator/VersionPolicy/StableReleaseInstalled.php b/src/Validator/VersionPolicy/StableReleaseInstalled.php index 299126d296f2c0f46b8cbaa8970d38516b989c76..f1f019bbce9c6f3af3f1a3d4d1a8a3c39ea79f11 100644 --- a/src/Validator/VersionPolicy/StableReleaseInstalled.php +++ b/src/Validator/VersionPolicy/StableReleaseInstalled.php @@ -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, ]), ]; diff --git a/src/Validator/VersionPolicy/TargetVersionStable.php b/src/Validator/VersionPolicy/TargetVersionStable.php index 64d61473f0995ce0ccfc14c886dc67f317f230b2..3e0c9de1e8331e7a9ee3fd2f59b3fbe3dc01cd35 100644 --- a/src/Validator/VersionPolicy/TargetVersionStable.php +++ b/src/Validator/VersionPolicy/TargetVersionStable.php @@ -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, ]), ]; diff --git a/src/Validator/XdebugValidator.php b/src/Validator/XdebugValidator.php index 95551c5f551194cc38bae34249e3af79b9f6ab3d..ef46b7c200c0f559fc87262aef316028c4281705 100644 --- a/src/Validator/XdebugValidator.php +++ b/src/Validator/XdebugValidator.php @@ -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.'), ]); } } diff --git a/tests/src/Kernel/ReadinessValidation/SettingsValidatorTest.php b/tests/src/Kernel/ReadinessValidation/SettingsValidatorTest.php index 52dfe3fd1ac7886502db86bf7a59f9b9823a58db..236af459fa6a0bad069ae1eb977273aeb526325d 100644 --- a/tests/src/Kernel/ReadinessValidation/SettingsValidatorTest.php +++ b/tests/src/Kernel/ReadinessValidation/SettingsValidatorTest.php @@ -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]], diff --git a/tests/src/Kernel/ReadinessValidation/VersionPolicyValidatorTest.php b/tests/src/Kernel/ReadinessValidation/VersionPolicyValidatorTest.php index 54102e41cea6fbf6a62094fc3657331270cdc0b7..a218c05637d4e4f561fc9b54e4976ae387e7e75c 100644 --- a/tests/src/Kernel/ReadinessValidation/VersionPolicyValidatorTest.php +++ b/tests/src/Kernel/ReadinessValidation/VersionPolicyValidatorTest.php @@ -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.', ]), ], ], diff --git a/tests/src/Unit/VersionPolicy/StableReleaseInstalledTest.php b/tests/src/Unit/VersionPolicy/StableReleaseInstalledTest.php index 759b51c6bf8ef798efc18c3d121f4f0305b25731..8ffa2d1b1fb002ed780205170e4c5c12fa104a9a 100644 --- a/tests/src/Unit/VersionPolicy/StableReleaseInstalledTest.php +++ b/tests/src/Unit/VersionPolicy/StableReleaseInstalledTest.php @@ -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.'], ], ]; } diff --git a/tests/src/Unit/VersionPolicy/TargetVersionStableTest.php b/tests/src/Unit/VersionPolicy/TargetVersionStableTest.php index ef6f3e2a82a1eaeace709ba4b02cd0d0738ae585..d963d01063af6783832a638fc4eb5cd704901301 100644 --- a/tests/src/Unit/VersionPolicy/TargetVersionStableTest.php +++ b/tests/src/Unit/VersionPolicy/TargetVersionStableTest.php @@ -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.'], ], ]; }