diff --git a/core/modules/auto_updates/auto_updates.install b/core/modules/auto_updates/auto_updates.install
index 424c4e8e7b..81c78c35b0 100644
--- a/core/modules/auto_updates/auto_updates.install
+++ b/core/modules/auto_updates/auto_updates.install
@@ -18,20 +18,20 @@ function auto_updates_requirements($phase) {
}
$requirements = [];
- /** @var \Drupal\auto_updates\ReadinessChecker\ReadinessCheckerManagerInterface $checker */
- $checker = \Drupal::service('auto_updates.readiness_checker');
- if (!$checker->isEnabled()) {
+ /** @var \Drupal\auto_updates\ReadinessChecker\ReadinessCheckerManagerInterface $checker_manager */
+ $checker_manager = \Drupal::service('auto_updates.readiness_checker');
+ if (!$checker_manager->isEnabled()) {
return [];
}
- $last_check_timestamp = $checker->timestamp();
+ $last_check_timestamp = $checker_manager->timestamp();
$requirements['auto_updates_readiness'] = [
'title' => t('Update readiness checks'),
'severity' => REQUIREMENT_OK,
'value' => t('Your site is ready to for automatic updates.', [':readiness_checks' => 'https://www.drupal.org/docs/8/update/automatic-updates#readiness-checks']),
];
- $error_results = $checker->getResults(ReadinessCheckerManagerInterface::ERROR);
- $warning_results = $checker->getResults(ReadinessCheckerManagerInterface::WARNING);
+ $error_results = $checker_manager->getResults(ReadinessCheckerManagerInterface::ERROR);
+ $warning_results = $checker_manager->getResults(ReadinessCheckerManagerInterface::WARNING);
$checker_results = array_merge($error_results, $warning_results);
if (!empty($checker_results)) {
$requirements['auto_updates_readiness']['severity'] = $error_results ? REQUIREMENT_ERROR : REQUIREMENT_WARNING;
diff --git a/core/modules/auto_updates/auto_updates.module b/core/modules/auto_updates/auto_updates.module
index 71fd29dce1..7fec2f650f 100644
--- a/core/modules/auto_updates/auto_updates.module
+++ b/core/modules/auto_updates/auto_updates.module
@@ -39,16 +39,16 @@ function auto_updates_page_top(array &$page_top) {
':url' => $readiness_settings->toString(),
]));
}
- /** @var \Drupal\auto_updates\ReadinessChecker\ReadinessCheckerManagerInterface $checker */
- $checker = \Drupal::service('auto_updates.readiness_checker');
- $results = $checker->getResults(ReadinessCheckerManagerInterface::ERROR);
+ /** @var \Drupal\auto_updates\ReadinessChecker\ReadinessCheckerManagerInterface $checker_manager */
+ $checker_manager = \Drupal::service('auto_updates.readiness_checker');
+ $results = $checker_manager->getResults(ReadinessCheckerManagerInterface::ERROR);
if ($results) {
\Drupal::messenger()->addError(t('Your site is currently failing readiness checks for automatic updates. It cannot be automatically updated until further action is performed:', [':readiness_checks' => 'https://www.drupal.org/docs/8/update/auto-updates#readiness-checks']));
foreach ($results as $message) {
\Drupal::messenger()->addError($message);
}
}
- $results = $checker->getResults(ReadinessCheckerManagerInterface::WARNING);
+ $results = $checker_manager->getResults(ReadinessCheckerManagerInterface::WARNING);
if ($results) {
\Drupal::messenger()->addWarning(t('Your site does not pass some readiness checks for automatic updates. Depending on the nature of the failures, it might effect the eligibility for automatic updates.', [':readiness_checks' => 'https://www.drupal.org/docs/8/update/auto-updates#readiness-checks']));
foreach ($results as $message) {
@@ -71,9 +71,9 @@ function auto_updates_cron() {
return;
}
- /** @var \Drupal\auto_updates\ReadinessChecker\ReadinessCheckerManagerInterface $checker */
- $checker = \Drupal::service('auto_updates.readiness_checker');
- $checker->run();
+ /** @var \Drupal\auto_updates\ReadinessChecker\ReadinessCheckerManagerInterface $checker_manager */
+ $checker_manager = \Drupal::service('auto_updates.readiness_checker');
+ $checker_manager->run();
}
/**
diff --git a/core/modules/auto_updates/src/Controller/ReadinessCheckerController.php b/core/modules/auto_updates/src/Controller/ReadinessCheckerController.php
index 1747228895..cd5ac996c5 100644
--- a/core/modules/auto_updates/src/Controller/ReadinessCheckerController.php
+++ b/core/modules/auto_updates/src/Controller/ReadinessCheckerController.php
@@ -20,18 +20,18 @@ class ReadinessCheckerController extends ControllerBase {
*
* @var \Drupal\auto_updates\ReadinessChecker\ReadinessCheckerManagerInterface
*/
- protected $checker;
+ protected $checkerManager;
/**
* ReadinessCheckerController constructor.
*
- * @param \Drupal\auto_updates\ReadinessChecker\ReadinessCheckerManagerInterface $checker
+ * @param \Drupal\auto_updates\ReadinessChecker\ReadinessCheckerManagerInterface $checker_manager
* The readiness checker manager.
* @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
* The string translation service.
*/
- public function __construct(ReadinessCheckerManagerInterface $checker, TranslationInterface $string_translation) {
- $this->checker = $checker;
+ public function __construct(ReadinessCheckerManagerInterface $checker_manager, TranslationInterface $string_translation) {
+ $this->checkerManager = $checker_manager;
$this->stringTranslation = $string_translation;
}
@@ -52,7 +52,7 @@ public static function create(ContainerInterface $container) {
* A redirect to the automatic updates settings page.
*/
public function run() {
- if (!array_filter($this->checker->run())) {
+ if (!array_filter($this->checkerManager->run())) {
$this->messenger()->addStatus($this->t('No issues found. Your site is ready for automatic updates.', [':readiness_checks' => 'https://www.drupal.org/docs/8/update/auto-updates#readiness-checks']));
}
return $this->redirect('auto_updates.settings');
diff --git a/core/modules/auto_updates/src/Form/SettingsForm.php b/core/modules/auto_updates/src/Form/SettingsForm.php
index 45539d65e2..a88eaaf14f 100644
--- a/core/modules/auto_updates/src/Form/SettingsForm.php
+++ b/core/modules/auto_updates/src/Form/SettingsForm.php
@@ -17,7 +17,7 @@ class SettingsForm extends ConfigFormBase {
*
* @var \Drupal\auto_updates\ReadinessChecker\ReadinessCheckerManagerInterface
*/
- protected $checker;
+ protected $checkerManager;
/**
* The date formatter.
@@ -31,7 +31,7 @@ class SettingsForm extends ConfigFormBase {
*/
public static function create(ContainerInterface $container) {
$instance = parent::create($container);
- $instance->checker = $container->get('auto_updates.readiness_checker');
+ $instance->checkerManager = $container->get('auto_updates.readiness_checker');
$instance->dateFormatter = $container->get('date.formatter');
return $instance;
}
@@ -64,13 +64,13 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#open' => TRUE,
];
- $last_check_timestamp = $this->checker->timestamp();
+ $last_check_timestamp = $this->checkerManager->timestamp();
$form['readiness']['enable_readiness_checks'] = [
'#type' => 'checkbox',
'#title' => $this->t('Check the readiness of automatically updating the site.'),
'#default_value' => $config->get('enable_readiness_checks'),
];
- if ($this->checker->isEnabled()) {
+ if ($this->checkerManager->isEnabled()) {
$readiness_messages = $last_check_timestamp === NULL ?
$this->t('Readiness checks have never been run.')
: $this->t('Readiness checks were last run @time ago.', ['@time' => $this->dateFormatter->formatTimeDiffSince($last_check_timestamp)]);