Commit 21e72a57 authored by Adam G-H's avatar Adam G-H
Browse files

Issue #3314764 by phenaproxima, tedbow, omkar.podey: Stop listening to ReadinessCheckEvent

parent f284c45b

automatic_updates.services.yml

+0 −60
Original line number Diff line number Diff line
@@ -61,66 +61,6 @@ services: 
    class: Drupal\automatic_updates\ReleaseChooser

    arguments:

      - '@automatic_updates.validator.version_policy'

  automatic_updates.composer_executable_validator:

    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck

    arguments:

      - '@package_manager.validator.composer_executable'

    tags:

      - { name: event_subscriber }

  automatic_updates.settings_validator:

    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck

    arguments:

      - '@package_manager.validator.settings'

    tags:

      - { name: event_subscriber }

  automatic_updates.validator.environment_support:

    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck

    arguments:

      - '@package_manager.validator.environment_support'

    tags:

      - { name: event_subscriber }

  automatic_updates.validator.composer_settings:

    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck

    arguments:

      - '@package_manager.validator.composer_settings'

    tags:

      - { name: event_subscriber }

  automatic_updates.disk_space_validator:

    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck

    arguments:

      - '@package_manager.validator.disk_space'

    tags:

      - { name: event_subscriber }

  automatic_updates.pending_updates_validator:

    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck

    arguments:

      - '@package_manager.validator.pending_updates'

    tags:

      - { name: event_subscriber }

  automatic_updates.validator.file_system_permissions:

    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck

    arguments:

      - '@package_manager.validator.file_system'

    tags:

      - { name: event_subscriber }

  automatic_updates.validator.multisite:

    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck

    arguments:

      - '@package_manager.validator.multisite'

    tags:

      - { name: event_subscriber }

  automatic_updates.validator.symlink:

    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck

    arguments:

      - '@package_manager.validator.symlink'

    tags:

      - { name: event_subscriber }

  automatic_updates.validator.patches:

    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck

    arguments:

      - '@package_manager.validator.patches'

    tags:

      - { name: event_subscriber }

  automatic_updates.cron_frequency_validator:

    class: Drupal\automatic_updates\Validator\CronFrequencyValidator

    arguments:

automatic_updates_extensions/src/Form/UpdateReady.php

+1 −5
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
namespace Drupal\automatic_updates_extensions\Form;



use Drupal\automatic_updates\Form\UpdateFormBase;

use Drupal\package_manager\Event\StatusCheckEvent;

use Drupal\package_manager\Exception\ApplyFailedException;

use Drupal\package_manager\ProjectInfo;

use Drupal\package_manager\ValidationResult;
@@ -166,10 +165,7 @@ final class UpdateReady extends UpdateFormBase { 


    // Don't run the status checks once the form has been submitted.

    if (!$form_state->getUserInput()) {

      $event = new StatusCheckEvent($this->updater);

      $this->eventDispatcher->dispatch($event);

      /** @var \Drupal\package_manager\ValidationResult[] $results */

      $results = $event->getResults();

      $results = $this->runStatusCheck($this->updater, $this->eventDispatcher);

      // This will have no effect if $results is empty.

      $this->displayResults($results, $this->renderer);

      // If any errors occurred, return the form early so the user cannot

automatic_updates_extensions/src/Form/UpdaterForm.php

+1 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


namespace Drupal\automatic_updates_extensions\Form;



use Drupal\automatic_updates\Event\ReadinessCheckEvent;

use Drupal\automatic_updates\Form\UpdateFormBase;

use Drupal\automatic_updates_extensions\BatchProcessor;

use Drupal\automatic_updates_extensions\ExtensionUpdater;
@@ -163,9 +162,7 @@ final class UpdaterForm extends UpdateFormBase { 
      $results = [];

    }

    else {

      $event = new ReadinessCheckEvent($this->extensionUpdater);

      $this->eventDispatcher->dispatch($event);

      $results = $event->getResults();

      $results = $this->runStatusCheck($this->extensionUpdater, $this->eventDispatcher, TRUE);

    }

    $this->displayResults($results, $this->renderer);

    $security_level = ValidationResult::getOverallSeverity($results);

automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php

+2 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


namespace Drupal\Tests\automatic_updates_extensions\Functional;



use Drupal\automatic_updates\Event\ReadinessCheckEvent;

use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;

use Drupal\package_manager_test_validation\StagedDatabaseUpdateValidator;

use Drupal\package_manager\Event\PreApplyEvent;
@@ -432,7 +431,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase { 
    $this->assertUpdatesCount(1);

    $message = t("You've not experienced Shakespeare until you have read him in the original Klingon.");

    $error = ValidationResult::createError([$message]);

    TestSubscriber1::setTestResult([$error], ReadinessCheckEvent::class);

    TestSubscriber1::setTestResult([$error], StatusCheckEvent::class);

    $this->getSession()->reload();

    $assert->pageTextContains($message);

    $assert->pageTextContains(static::$errorsExplanation);
@@ -450,7 +449,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase { 
    $this->checkForUpdates();

    $message = t("Warning! Updating this module may cause an error.");

    $warning = ValidationResult::createWarning([$message]);

    TestSubscriber1::setTestResult([$warning], ReadinessCheckEvent::class);

    TestSubscriber1::setTestResult([$warning], StatusCheckEvent::class);

    // Navigate to the automatic updates form.

    $this->drupalGet('/admin/reports/updates');

    $this->clickLink('Update Extensions');

automatic_updates_extensions/tests/src/Kernel/ExtensionUpdaterTest.php

+2 −2
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 
namespace Drupal\Tests\automatic_updates_extensions\Kernel;



use Drupal\automatic_updates\Exception\UpdateException;

use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;

use Drupal\package_manager\Event\PreApplyEvent;

use Drupal\package_manager\Event\PreCreateEvent;

use Drupal\package_manager\Event\PreRequireEvent;

use Drupal\package_manager\ValidationResult;

use Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber;

use Drupal\Tests\user\Traits\UserCreationTrait;



/**
@@ -165,7 +165,7 @@ class ExtensionUpdaterTest extends AutomaticUpdatesExtensionsKernelTestBase { 
    $results = [

      ValidationResult::createError(['An error of some sorts.']),

    ];

    TestSubscriber::setTestResult($results, $event_class);

    TestSubscriber1::setTestResult($results, $event_class);

    try {

      $extension_updater->begin(['my_module' => '9.8.1']);

      $extension_updater->stage();