diff --git a/package_manager/src/Event/ErrorEventInterface.php b/package_manager/src/Event/ErrorEventInterface.php deleted file mode 100644 index 493c8f50c3aa8f80e65e2c0c8228f62af2d8f300..0000000000000000000000000000000000000000 --- a/package_manager/src/Event/ErrorEventInterface.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php - -namespace Drupal\package_manager\Event; - -use Drupal\Core\StringTranslation\TranslatableMarkup; - -/** - * Defines an interface for events which can collect validation errors. - */ -interface ErrorEventInterface { - - /** - * Adds a validation error. - * - * @param \Drupal\Core\StringTranslation\TranslatableMarkup[] $messages - * The error messages. - * @param \Drupal\Core\StringTranslation\TranslatableMarkup|null $summary - * (optional) The summary. - */ - public function addError(array $messages, TranslatableMarkup $summary = NULL); - -} diff --git a/package_manager/src/Event/PostApplyEvent.php b/package_manager/src/Event/PostApplyEvent.php index 7cd729158262e96ed98a9b0106b5271be7dd39f9..d2a9693cf9c3ee99970538fdbf404564c80309ac 100644 --- a/package_manager/src/Event/PostApplyEvent.php +++ b/package_manager/src/Event/PostApplyEvent.php @@ -5,5 +5,5 @@ namespace Drupal\package_manager\Event; /** * Event fired after staged changes are synced to the active directory. */ -class PostApplyEvent extends PostOperationStageEvent { +class PostApplyEvent extends StageEvent { } diff --git a/package_manager/src/Event/PostCreateEvent.php b/package_manager/src/Event/PostCreateEvent.php index a0833522ff0ccdbc79cc7c6d667eb85782902cbb..104bc78ad6ff0681c83ad3f494ee8e309c87f7e9 100644 --- a/package_manager/src/Event/PostCreateEvent.php +++ b/package_manager/src/Event/PostCreateEvent.php @@ -5,5 +5,5 @@ namespace Drupal\package_manager\Event; /** * Event fired after a staging area has been created. */ -class PostCreateEvent extends PostOperationStageEvent { +class PostCreateEvent extends StageEvent { } diff --git a/package_manager/src/Event/PostDestroyEvent.php b/package_manager/src/Event/PostDestroyEvent.php index 7402ae9a8d75e9f2e4f7ec195a8810ad19799b75..3388a988e126da919dfbc598946910f38b86cbbe 100644 --- a/package_manager/src/Event/PostDestroyEvent.php +++ b/package_manager/src/Event/PostDestroyEvent.php @@ -5,5 +5,5 @@ namespace Drupal\package_manager\Event; /** * Event fired after the staging area is destroyed. */ -class PostDestroyEvent extends PostOperationStageEvent { +class PostDestroyEvent extends StageEvent { } diff --git a/package_manager/src/Event/PostOperationStageEvent.php b/package_manager/src/Event/PostOperationStageEvent.php deleted file mode 100644 index 6751d87a1360b872fa6212a59cabeb20d470c879..0000000000000000000000000000000000000000 --- a/package_manager/src/Event/PostOperationStageEvent.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php - -namespace Drupal\package_manager\Event; - -use Drupal\Core\StringTranslation\TranslatableMarkup; -use Drupal\package_manager\ValidationResult; - -/** - * Base class for events dispatched after a stage life cycle operation. - */ -abstract class PostOperationStageEvent extends StageEvent implements WarningEventInterface { - - /** - * {@inheritdoc} - */ - public function addWarning(array $messages, ?TranslatableMarkup $summary = NULL) { - $this->results[] = ValidationResult::createWarning($messages, $summary); - } - -} diff --git a/package_manager/src/Event/PostRequireEvent.php b/package_manager/src/Event/PostRequireEvent.php index 78e1ceda753fde1c81eb0582eb9fc8f8593b6406..55b4184dd3d96daaeeba55317c227fd0bbfb089c 100644 --- a/package_manager/src/Event/PostRequireEvent.php +++ b/package_manager/src/Event/PostRequireEvent.php @@ -5,5 +5,5 @@ namespace Drupal\package_manager\Event; /** * Event fired after packages are added to the staging area. */ -class PostRequireEvent extends PostOperationStageEvent { +class PostRequireEvent extends StageEvent { } diff --git a/package_manager/src/Event/PreOperationStageEvent.php b/package_manager/src/Event/PreOperationStageEvent.php index 3bb91df6050b69519f9570426aa59558b45fba30..ee826f3ac35cdfe6f3a987112786d16a666b7ff9 100644 --- a/package_manager/src/Event/PreOperationStageEvent.php +++ b/package_manager/src/Event/PreOperationStageEvent.php @@ -8,7 +8,7 @@ use Drupal\package_manager\ValidationResult; /** * Base class for events dispatched before a stage life cycle operation. */ -abstract class PreOperationStageEvent extends StageEvent implements ErrorEventInterface { +abstract class PreOperationStageEvent extends StageEvent { /** * {@inheritdoc} diff --git a/package_manager/src/Event/WarningEventInterface.php b/package_manager/src/Event/WarningEventInterface.php deleted file mode 100644 index 74f087a1b63e1614a4df71505d75eb4f1b501eea..0000000000000000000000000000000000000000 --- a/package_manager/src/Event/WarningEventInterface.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php - -namespace Drupal\package_manager\Event; - -use Drupal\Core\StringTranslation\TranslatableMarkup; - -/** - * Defines an interface for events which can collect validation warnings. - */ -interface WarningEventInterface { - - /** - * Adds a warning. - * - * @param array $messages - * The warning messages. - * @param \Drupal\Core\StringTranslation\TranslatableMarkup|null $summary - * (optional) The summary. - */ - public function addWarning(array $messages, TranslatableMarkup $summary = NULL); - -} diff --git a/package_manager/src/EventSubscriber/PostOperationStageValidatorInterface.php b/package_manager/src/EventSubscriber/PostOperationStageValidatorInterface.php deleted file mode 100644 index 5613002845326153c3fca5b8c41a44125fabb6b0..0000000000000000000000000000000000000000 --- a/package_manager/src/EventSubscriber/PostOperationStageValidatorInterface.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php - -namespace Drupal\package_manager\EventSubscriber; - -use Drupal\package_manager\Event\PostOperationStageEvent; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; - -/** - * Defines an interface for classes that validate a stage after an operation. - */ -interface PostOperationStageValidatorInterface extends EventSubscriberInterface { - - /** - * Validates a stage after an operation. - * - * @param \Drupal\package_manager\Event\PostOperationStageEvent $event - * The stage event. - */ - public function validateStagePostOperation(PostOperationStageEvent $event): void; - -} diff --git a/package_manager/tests/src/Kernel/StageEventsTest.php b/package_manager/tests/src/Kernel/StageEventsTest.php index c5f92892fe8bf6974de51fcc81f05b5a6c482cdd..eb5f46c1b45bfd05691a3258960b5af4856082ef 100644 --- a/package_manager/tests/src/Kernel/StageEventsTest.php +++ b/package_manager/tests/src/Kernel/StageEventsTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\package_manager\Kernel; -use Drupal\package_manager\Event\ErrorEventInterface; use Drupal\package_manager\Event\PostApplyEvent; use Drupal\package_manager\Event\PostCreateEvent; use Drupal\package_manager\Event\PostDestroyEvent; @@ -10,9 +9,9 @@ use Drupal\package_manager\Event\PostRequireEvent; use Drupal\package_manager\Event\PreApplyEvent; use Drupal\package_manager\Event\PreCreateEvent; use Drupal\package_manager\Event\PreDestroyEvent; +use Drupal\package_manager\Event\PreOperationStageEvent; use Drupal\package_manager\Event\PreRequireEvent; use Drupal\package_manager\Event\StageEvent; -use Drupal\package_manager\Event\WarningEventInterface; use Drupal\package_manager\Exception\StageValidationException; use Drupal\package_manager\Stage; use Symfony\Component\EventDispatcher\EventSubscriberInterface; @@ -76,7 +75,7 @@ class StageEventsTest extends PackageManagerKernelTestBase implements EventSubsc /** * Handles a staging area life cycle event. * - * @param \Drupal\package_manager\Event\PreOperationStageEvent|\Drupal\package_manager\Event\PostOperationStageEvent $event + * @param \Drupal\package_manager\Event\StageEvent $event * The event object. */ public function handleEvent(StageEvent $event): void { @@ -118,13 +117,9 @@ class StageEventsTest extends PackageManagerKernelTestBase implements EventSubsc public function providerValidationResults(): array { return [ [PreCreateEvent::class], - [PostCreateEvent::class], [PreRequireEvent::class], - [PostRequireEvent::class], [PreApplyEvent::class], - [PostApplyEvent::class], [PreDestroyEvent::class], - [PostDestroyEvent::class], ]; } @@ -141,12 +136,9 @@ class StageEventsTest extends PackageManagerKernelTestBase implements EventSubsc // class under test. $handler = function (StageEvent $event) use ($event_class): void { if (get_class($event) === $event_class) { - if ($event instanceof ErrorEventInterface) { + if ($event instanceof PreOperationStageEvent) { $event->addError([['Burn, baby, burn']]); } - elseif ($event instanceof WarningEventInterface) { - $event->addWarning(['Be careful about fires.']); - } } }; $this->container->get('event_dispatcher') diff --git a/src/Event/ReadinessCheckEvent.php b/src/Event/ReadinessCheckEvent.php index 50524211f7ee8173350413538b66a9202a14dc57..c226ecd35d7e5848081fd6525fac096472085e82 100644 --- a/src/Event/ReadinessCheckEvent.php +++ b/src/Event/ReadinessCheckEvent.php @@ -5,7 +5,6 @@ namespace Drupal\automatic_updates\Event; use Drupal\automatic_updates\Updater; use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\package_manager\Event\PreOperationStageEvent; -use Drupal\package_manager\Event\WarningEventInterface; use Drupal\package_manager\ValidationResult; /** @@ -20,7 +19,7 @@ use Drupal\package_manager\ValidationResult; * * @see \Drupal\automatic_updates\Validation\ReadinessValidationManager */ -class ReadinessCheckEvent extends PreOperationStageEvent implements WarningEventInterface { +class ReadinessCheckEvent extends PreOperationStageEvent { /** * The desired package versions to update to, keyed by package name.