From 9884d649e9f6f0a9b420f85d38254e8e60ba2ac6 Mon Sep 17 00:00:00 2001
From: Kunal Sachdev <kunal.sachdev@3685163.no-reply.drupal.org>
Date: Wed, 7 Jun 2023 13:11:48 +0530
Subject: [PATCH 1/6] listen to statuscheck event
---
src/Validator/RequestedUpdateValidator.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Validator/RequestedUpdateValidator.php b/src/Validator/RequestedUpdateValidator.php
index fc3bcea5c9..b8c0d56710 100644
--- a/src/Validator/RequestedUpdateValidator.php
+++ b/src/Validator/RequestedUpdateValidator.php
@@ -9,6 +9,7 @@ use Drupal\automatic_updates\UpdateStage;
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\package_manager\ComposerInspector;
use Drupal\package_manager\Event\PreApplyEvent;
+use Drupal\package_manager\Event\StatusCheckEvent;
use Drupal\package_manager\PathLocator;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -45,7 +46,7 @@ final class RequestedUpdateValidator implements EventSubscriberInterface {
*/
public function checkRequestedStagedVersion(PreApplyEvent $event): void {
$stage = $event->stage;
- if (!($stage instanceof UpdateStage)) {
+ if (!($stage instanceof UpdateStage) || !$stage->stageDirectoryExists()) {
return;
}
$requested_package_versions = $stage->getPackageVersions();
@@ -96,6 +97,7 @@ final class RequestedUpdateValidator implements EventSubscriberInterface {
* {@inheritdoc}
*/
public static function getSubscribedEvents(): array {
+ $events[StatusCheckEvent::class][] = ['checkRequestedStagedVersion'];
$events[PreApplyEvent::class][] = ['checkRequestedStagedVersion'];
return $events;
}
--
GitLab
From beadc3ff9d698c47894776424000fd0c96d5a745 Mon Sep 17 00:00:00 2001
From: Kunal Sachdev <kunal.sachdev@3685163.no-reply.drupal.org>
Date: Wed, 7 Jun 2023 13:33:16 +0530
Subject: [PATCH 2/6] nit
---
src/Validator/RequestedUpdateValidator.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Validator/RequestedUpdateValidator.php b/src/Validator/RequestedUpdateValidator.php
index b8c0d56710..9c072bf62e 100644
--- a/src/Validator/RequestedUpdateValidator.php
+++ b/src/Validator/RequestedUpdateValidator.php
@@ -9,6 +9,7 @@ use Drupal\automatic_updates\UpdateStage;
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\package_manager\ComposerInspector;
use Drupal\package_manager\Event\PreApplyEvent;
+use Drupal\package_manager\Event\PreOperationStageEvent;
use Drupal\package_manager\Event\StatusCheckEvent;
use Drupal\package_manager\PathLocator;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -41,10 +42,10 @@ final class RequestedUpdateValidator implements EventSubscriberInterface {
/**
* Validates that requested packages have been updated to the right version.
*
- * @param \Drupal\package_manager\Event\PreApplyEvent $event
+ * @param \Drupal\package_manager\Event\PreOperationStageEvent $event
* The pre-apply event.
*/
- public function checkRequestedStagedVersion(PreApplyEvent $event): void {
+ public function checkRequestedStagedVersion(PreOperationStageEvent $event): void {
$stage = $event->stage;
if (!($stage instanceof UpdateStage) || !$stage->stageDirectoryExists()) {
return;
--
GitLab
From 375a5c4a58a4dd2a897c4c319c5f259486f07b20 Mon Sep 17 00:00:00 2001
From: Kunal Sachdev <kunal.sachdev@3685163.no-reply.drupal.org>
Date: Wed, 7 Jun 2023 14:28:27 +0530
Subject: [PATCH 3/6] resolve failure in UpdateLockTest
---
tests/src/Functional/UpdateLockTest.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/src/Functional/UpdateLockTest.php b/tests/src/Functional/UpdateLockTest.php
index 8cab3f1179..a7dcbe76c4 100644
--- a/tests/src/Functional/UpdateLockTest.php
+++ b/tests/src/Functional/UpdateLockTest.php
@@ -42,7 +42,7 @@ class UpdateLockTest extends AutomaticUpdatesFunctionalTestBase {
* Tests that only user who started an update can continue through it.
*/
public function testLock(): void {
- $this->getStageFixtureManipulator()->setCorePackageVersion('9.8.1');
+ $this->getStageFixtureManipulator()->setCorePackageVersion('9.8.2');
$page = $this->getSession()->getPage();
$assert_session = $this->assertSession();
$this->mockActiveCoreVersion('9.8.0');
@@ -56,7 +56,7 @@ class UpdateLockTest extends AutomaticUpdatesFunctionalTestBase {
$this->drupalGet('/admin/modules/update');
$page->pressButton('Update');
$this->checkForMetaRefresh();
- $this->assertUpdateReady('9.8.1');
+ $this->assertUpdateReady('9.8.2');
$assert_session->buttonExists('Continue');
$url = $this->getSession()->getCurrentUrl();
--
GitLab
From 5ae868bfbdbcc165908952e03dfadaa5eb6c349c Mon Sep 17 00:00:00 2001
From: Kunal Sachdev <kunal.sachdev@3685163.no-reply.drupal.org>
Date: Wed, 7 Jun 2023 14:29:17 +0530
Subject: [PATCH 4/6] change staged update to 9.8.2 as requested update is
9.8.2
---
tests/src/Functional/UpdateWarningTest.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/src/Functional/UpdateWarningTest.php b/tests/src/Functional/UpdateWarningTest.php
index 27da2f1228..96ad003883 100644
--- a/tests/src/Functional/UpdateWarningTest.php
+++ b/tests/src/Functional/UpdateWarningTest.php
@@ -19,6 +19,7 @@ class UpdateWarningTest extends UpdaterFormTestBase {
* Tests that update can be completed even if a status check throws a warning.
*/
public function testContinueOnWarning(): void {
+ $this->getStageFixtureManipulator()->setCorePackageVersion('9.8.1');
$session = $this->getSession();
$this->mockActiveCoreVersion('9.8.0');
--
GitLab
From 4aeb31770f9fae83de0083d830189cb02cf21342 Mon Sep 17 00:00:00 2001
From: Kunal Sachdev <kunal.sachdev@3685163.no-reply.drupal.org>
Date: Wed, 7 Jun 2023 17:29:46 +0530
Subject: [PATCH 5/6] updated test coverage
---
.../RequestedUpdateValidatorTest.php | 20 +++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/tests/src/Kernel/StatusCheck/RequestedUpdateValidatorTest.php b/tests/src/Kernel/StatusCheck/RequestedUpdateValidatorTest.php
index 6232821993..7ffd8cbdfe 100644
--- a/tests/src/Kernel/StatusCheck/RequestedUpdateValidatorTest.php
+++ b/tests/src/Kernel/StatusCheck/RequestedUpdateValidatorTest.php
@@ -41,13 +41,13 @@ class RequestedUpdateValidatorTest extends AutomaticUpdatesKernelTestBase {
$this->container->get('module_installer')->install(['automatic_updates']);
$stage = $this->container->get(UpdateStage::class);
- $stage->begin(['drupal' => '9.8.1']);
- $stage->stage();
-
$expected_results = [
ValidationResult::createError([t("The requested update to 'drupal/core-recommended' to version '9.8.1' does not match the actual staged update to '9.8.2'.")]),
ValidationResult::createError([t("The requested update to 'drupal/core-dev' to version '9.8.1' was not performed.")]),
];
+ $stage->begin(['drupal' => '9.8.1']);
+ $this->assertStatusCheckResults($expected_results, $stage);
+ $stage->stage();
try {
$stage->apply();
$this->fail('Expecting an exception.');
@@ -72,12 +72,20 @@ class RequestedUpdateValidatorTest extends AutomaticUpdatesKernelTestBase {
]);
$this->container->get('module_installer')->install(['automatic_updates']);
+ $expected_results = [
+ ValidationResult::createError([t('No updates detected in the staging area.')]),
+ ];
$stage = $this->container->get(UpdateStage::class);
$stage->begin(['drupal' => '9.8.1']);
+ $this->assertStatusCheckResults($expected_results, $stage);
$stage->stage();
- $this->expectException(StageEventException::class);
- $this->expectExceptionMessage('No updates detected in the staging area.');
- $stage->apply();
+ try {
+ $stage->apply();
+ $this->fail('Expecting an exception.');
+ }
+ catch (StageEventException $exception) {
+ $this->assertExpectedResultsFromException($expected_results, $exception);
+ }
}
}
--
GitLab
From 65e76f4b67a9cbef2095eedb2e257f20515ea9bb Mon Sep 17 00:00:00 2001
From: Ted Bowman <ted+git@tedbow.com>
Date: Wed, 21 Jun 2023 14:10:12 -0400
Subject: [PATCH 6/6] param type
---
src/Validator/RequestedUpdateValidator.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/Validator/RequestedUpdateValidator.php b/src/Validator/RequestedUpdateValidator.php
index 9c072bf62e..09762abe26 100644
--- a/src/Validator/RequestedUpdateValidator.php
+++ b/src/Validator/RequestedUpdateValidator.php
@@ -9,7 +9,6 @@ use Drupal\automatic_updates\UpdateStage;
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\package_manager\ComposerInspector;
use Drupal\package_manager\Event\PreApplyEvent;
-use Drupal\package_manager\Event\PreOperationStageEvent;
use Drupal\package_manager\Event\StatusCheckEvent;
use Drupal\package_manager\PathLocator;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -42,10 +41,10 @@ final class RequestedUpdateValidator implements EventSubscriberInterface {
/**
* Validates that requested packages have been updated to the right version.
*
- * @param \Drupal\package_manager\Event\PreOperationStageEvent $event
+ * @param \Drupal\package_manager\Event\PreApplyEvent|\Drupal\package_manager\Event\StatusCheckEvent $event
* The pre-apply event.
*/
- public function checkRequestedStagedVersion(PreOperationStageEvent $event): void {
+ public function checkRequestedStagedVersion(PreApplyEvent|StatusCheckEvent $event): void {
$stage = $event->stage;
if (!($stage instanceof UpdateStage) || !$stage->stageDirectoryExists()) {
return;
--
GitLab