diff --git a/package_manager/src/Validator/ComposerExecutableValidator.php b/package_manager/src/Validator/ComposerExecutableValidator.php index 9156c2d41460f9d8863325efa7f87adc59afb497..3d4aeb6a1d69fecafb6651de05dfb0135fa5937a 100644 --- a/package_manager/src/Validator/ComposerExecutableValidator.php +++ b/package_manager/src/Validator/ComposerExecutableValidator.php @@ -59,9 +59,9 @@ class ComposerExecutableValidator implements EventSubscriberInterface { ) {} /** - * {@inheritdoc} + * Validates that the Composer executable is the correct version. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { // Return early if Composer is not available. try { // The "Composer is available" precondition requires active and stage @@ -143,9 +143,9 @@ class ComposerExecutableValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'validateStagePreOperation', - PreApplyEvent::class => 'validateStagePreOperation', - StatusCheckEvent::class => 'validateStagePreOperation', + PreCreateEvent::class => 'validate', + PreApplyEvent::class => 'validate', + StatusCheckEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/ComposerJsonExistsValidator.php b/package_manager/src/Validator/ComposerJsonExistsValidator.php index d5fdf9a89f4d5f8c2e0e98547a63fb67b2b7458a..9eb1231436bdd4d17d805e11455423a21f78b743 100644 --- a/package_manager/src/Validator/ComposerJsonExistsValidator.php +++ b/package_manager/src/Validator/ComposerJsonExistsValidator.php @@ -40,9 +40,9 @@ final class ComposerJsonExistsValidator implements EventSubscriberInterface { // Set priority to 190 which puts it just after EnvironmentSupportValidator. // @see \Drupal\package_manager\Validator\EnvironmentSupportValidator return [ - PreCreateEvent::class => ['validateComposerJson', 190], - PreApplyEvent::class => ['validateComposerJson', 190], - StatusCheckEvent::class => ['validateComposerJson', 190], + PreCreateEvent::class => ['validate', 190], + PreApplyEvent::class => ['validate', 190], + StatusCheckEvent::class => ['validate', 190], ]; } @@ -52,7 +52,7 @@ final class ComposerJsonExistsValidator implements EventSubscriberInterface { * @param \Drupal\package_manager\Event\PreOperationStageEvent $event * The event. */ - public function validateComposerJson(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { $project_root = $this->pathLocator->getProjectRoot(); if (!file_exists($project_root . '/composer.json')) { $event->addError([$this->t('No composer.json file can be found at @project_root', ['@project_root' => $project_root])]); diff --git a/package_manager/src/Validator/ComposerMinimumStabilityValidator.php b/package_manager/src/Validator/ComposerMinimumStabilityValidator.php index b5ab5d3da7f2d69f2faa7a996790e1244da2c4e7..28efe36294c5174bc124d9059a77a56e93eae248 100644 --- a/package_manager/src/Validator/ComposerMinimumStabilityValidator.php +++ b/package_manager/src/Validator/ComposerMinimumStabilityValidator.php @@ -41,7 +41,7 @@ final class ComposerMinimumStabilityValidator implements EventSubscriberInterfac * @param \Drupal\package_manager\Event\PreRequireEvent $event * The stage event. */ - public function validateMinimumStability(PreRequireEvent $event): void { + public function validate(PreRequireEvent $event): void { $dir = $this->pathLocator->getProjectRoot(); $minimum_stability = $this->inspector->getConfig('minimum-stability', $dir); $requested_packages = $event->getRuntimePackages(); @@ -81,7 +81,7 @@ final class ComposerMinimumStabilityValidator implements EventSubscriberInterfac */ public static function getSubscribedEvents(): array { return [ - PreRequireEvent::class => 'validateMinimumStability', + PreRequireEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/ComposerPatchesValidator.php b/package_manager/src/Validator/ComposerPatchesValidator.php index 4ef054b2d0babd411483968f87120bad34dde0c2..17332e32b88dc09a96a424129b9580d3554f6f9f 100644 --- a/package_manager/src/Validator/ComposerPatchesValidator.php +++ b/package_manager/src/Validator/ComposerPatchesValidator.php @@ -60,7 +60,7 @@ final class ComposerPatchesValidator implements EventSubscriberInterface { * @param \Drupal\package_manager\Event\PreOperationStageEvent $event * The event object. */ - public function validatePatcher(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { $messages = []; $stage = $event->stage; @@ -162,9 +162,9 @@ final class ComposerPatchesValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'validatePatcher', - PreApplyEvent::class => 'validatePatcher', - StatusCheckEvent::class => 'validatePatcher', + PreCreateEvent::class => 'validate', + PreApplyEvent::class => 'validate', + StatusCheckEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/ComposerPluginsValidator.php b/package_manager/src/Validator/ComposerPluginsValidator.php index a2dc256d31664b61f11bfb328241606dedd52050..32abde46dad146459547a23f47f0e4cd67ee5dcc 100644 --- a/package_manager/src/Validator/ComposerPluginsValidator.php +++ b/package_manager/src/Validator/ComposerPluginsValidator.php @@ -147,9 +147,9 @@ final class ComposerPluginsValidator implements EventSubscriberInterface { } /** - * {@inheritdoc} + * Validates the allowed Composer plugins, both in active and stage. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { $stage = $event->stage; // When about to copy the changes from the stage directory to the active @@ -208,9 +208,9 @@ final class ComposerPluginsValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'validateStagePreOperation', - PreApplyEvent::class => 'validateStagePreOperation', - StatusCheckEvent::class => 'validateStagePreOperation', + PreCreateEvent::class => 'validate', + PreApplyEvent::class => 'validate', + StatusCheckEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/ComposerSettingsValidator.php b/package_manager/src/Validator/ComposerSettingsValidator.php index 6c934f52445226df0e25755f52ccd0794adf7dde..eefa93945c2d2d905c23e1cfd4276533d1af8191 100644 --- a/package_manager/src/Validator/ComposerSettingsValidator.php +++ b/package_manager/src/Validator/ComposerSettingsValidator.php @@ -37,9 +37,9 @@ final class ComposerSettingsValidator implements EventSubscriberInterface { } /** - * {@inheritdoc} + * Validates Composer settings. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { $dir = $this->pathLocator->getProjectRoot(); try { @@ -63,9 +63,9 @@ final class ComposerSettingsValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'validateStagePreOperation', - PreApplyEvent::class => 'validateStagePreOperation', - StatusCheckEvent::class => 'validateStagePreOperation', + PreCreateEvent::class => 'validate', + PreApplyEvent::class => 'validate', + StatusCheckEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/DiskSpaceValidator.php b/package_manager/src/Validator/DiskSpaceValidator.php index a2f36e2a635f613073c1b731f7f059a73131dd6c..b2b301431286a08250fc7862854f54a555344a0b 100644 --- a/package_manager/src/Validator/DiskSpaceValidator.php +++ b/package_manager/src/Validator/DiskSpaceValidator.php @@ -94,9 +94,9 @@ class DiskSpaceValidator implements EventSubscriberInterface { } /** - * {@inheritdoc} + * Validates that there is enough free disk space to do stage operations. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { $root_path = $this->pathLocator->getProjectRoot(); $vendor_path = $this->pathLocator->getVendorDirectory(); $messages = []; @@ -157,9 +157,9 @@ class DiskSpaceValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'validateStagePreOperation', - PreApplyEvent::class => 'validateStagePreOperation', - StatusCheckEvent::class => 'validateStagePreOperation', + PreCreateEvent::class => 'validate', + PreApplyEvent::class => 'validate', + StatusCheckEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/DuplicateInfoFileValidator.php b/package_manager/src/Validator/DuplicateInfoFileValidator.php index c328aa7e9e13f3ac5c9a6b1e2a770960fa4077a0..fe6fe42c177848debe6ea8d1c7c57becb3af02bb 100644 --- a/package_manager/src/Validator/DuplicateInfoFileValidator.php +++ b/package_manager/src/Validator/DuplicateInfoFileValidator.php @@ -34,7 +34,7 @@ class DuplicateInfoFileValidator implements EventSubscriberInterface { /** * Validates the stage does not have duplicate info.yml not present in active. */ - public function validateDuplicateInfoFileInStage(PreApplyEvent $event): void { + public function validate(PreApplyEvent $event): void { $active_dir = $this->pathLocator->getProjectRoot(); $stage_dir = $event->stage->getStageDirectory(); $active_info_files = $this->findInfoFiles($active_dir); @@ -72,7 +72,7 @@ class DuplicateInfoFileValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreApplyEvent::class => 'validateDuplicateInfoFileInStage', + PreApplyEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/EnvironmentSupportValidator.php b/package_manager/src/Validator/EnvironmentSupportValidator.php index 206403a68aef900dc22ad7d79c68b3b7f78a980b..36928d5ace65354925f78675f09ee9aca757538c 100644 --- a/package_manager/src/Validator/EnvironmentSupportValidator.php +++ b/package_manager/src/Validator/EnvironmentSupportValidator.php @@ -37,9 +37,9 @@ final class EnvironmentSupportValidator implements EventSubscriberInterface { public const VARIABLE_NAME = 'DRUPAL_PACKAGE_MANAGER_NOT_SUPPORTED_HELP_URL'; /** - * {@inheritdoc} + * Checks that this environment supports Package Manager. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { $message = $this->t('Package Manager is not supported by your environment.'); $help_url = getenv(static::VARIABLE_NAME); @@ -66,9 +66,9 @@ final class EnvironmentSupportValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => ['validateStagePreOperation', 200], - PreApplyEvent::class => ['validateStagePreOperation', 200], - StatusCheckEvent::class => ['validateStagePreOperation', 200], + PreCreateEvent::class => ['validate', 200], + PreApplyEvent::class => ['validate', 200], + StatusCheckEvent::class => ['validate', 200], ]; } diff --git a/package_manager/src/Validator/LockFileValidator.php b/package_manager/src/Validator/LockFileValidator.php index 4dcbd6dc6deb2552fe3833c8fdd6429851490a7e..d54c37cbf952bc31b4b936e23a8883a86ed2d547 100644 --- a/package_manager/src/Validator/LockFileValidator.php +++ b/package_manager/src/Validator/LockFileValidator.php @@ -85,9 +85,9 @@ final class LockFileValidator implements EventSubscriberInterface { } /** - * {@inheritdoc} + * Checks that the active lock file is unchanged during stage operations. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { // Early return if the stage is not already created. if ($event instanceof StatusCheckEvent && $event->stage->isAvailable()) { return; @@ -139,9 +139,9 @@ final class LockFileValidator implements EventSubscriberInterface { public static function getSubscribedEvents(): array { return [ PreCreateEvent::class => 'storeHash', - PreRequireEvent::class => 'validateStagePreOperation', - PreApplyEvent::class => 'validateStagePreOperation', - StatusCheckEvent::class => 'validateStagePreOperation', + PreRequireEvent::class => 'validate', + PreApplyEvent::class => 'validate', + StatusCheckEvent::class => 'validate', PostDestroyEvent::class => 'deleteHash', ]; } diff --git a/package_manager/src/Validator/MultisiteValidator.php b/package_manager/src/Validator/MultisiteValidator.php index 614a701b25608e683eabafaa07c18da8022fae5a..6b3b95e5fc0df7d941cbdef3bf5810583cc98831 100644 --- a/package_manager/src/Validator/MultisiteValidator.php +++ b/package_manager/src/Validator/MultisiteValidator.php @@ -34,9 +34,9 @@ final class MultisiteValidator implements EventSubscriberInterface { } /** - * {@inheritdoc} + * Validates that the current site is not part of a multisite. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { if ($this->isMultisite()) { $event->addError([ $this->t('Drupal multisite is not supported by Package Manager.'), @@ -65,9 +65,9 @@ final class MultisiteValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'validateStagePreOperation', - PreApplyEvent::class => 'validateStagePreOperation', - StatusCheckEvent::class => 'validateStagePreOperation', + PreCreateEvent::class => 'validate', + PreApplyEvent::class => 'validate', + StatusCheckEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/OverwriteExistingPackagesValidator.php b/package_manager/src/Validator/OverwriteExistingPackagesValidator.php index 6ff40f32d74f41821a05feca4691f68614329ae4..a401553fca95cc3cea73b7e1a1c31d6f43dcd589 100644 --- a/package_manager/src/Validator/OverwriteExistingPackagesValidator.php +++ b/package_manager/src/Validator/OverwriteExistingPackagesValidator.php @@ -51,7 +51,7 @@ final class OverwriteExistingPackagesValidator implements EventSubscriberInterfa /** * Validates that new installed packages don't overwrite existing directories. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { $stage = $event->stage; $active_composer = $stage->getActiveComposer(); $stage_composer = $stage->getStageComposer(); @@ -96,7 +96,7 @@ final class OverwriteExistingPackagesValidator implements EventSubscriberInterfa */ public static function getSubscribedEvents(): array { return [ - PreApplyEvent::class => 'validateStagePreOperation', + PreApplyEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/PendingUpdatesValidator.php b/package_manager/src/Validator/PendingUpdatesValidator.php index 86dc2dd6bc6bbd2e8c0941f4492d635b8d37aea3..335427dd3e392688c76d261cd3b0fdfbecc96f65 100644 --- a/package_manager/src/Validator/PendingUpdatesValidator.php +++ b/package_manager/src/Validator/PendingUpdatesValidator.php @@ -37,9 +37,9 @@ final class PendingUpdatesValidator implements EventSubscriberInterface { } /** - * {@inheritdoc} + * Validates that there are no pending database updates. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { if ($this->updatesExist()) { $message = $this->t('Some modules have database schema updates to install. You should run the <a href=":update">database update script</a> immediately.', [ ':update' => Url::fromRoute('system.db_update')->toString(), @@ -71,9 +71,9 @@ final class PendingUpdatesValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'validateStagePreOperation', - StatusCheckEvent::class => 'validateStagePreOperation', - PreApplyEvent::class => 'validateStagePreOperation', + PreCreateEvent::class => 'validate', + StatusCheckEvent::class => 'validate', + PreApplyEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/SettingsValidator.php b/package_manager/src/Validator/SettingsValidator.php index e0608f56296bbf35a0ded19fbe3c339114fb374e..9733d5f788f67d2d184d94574e19351612017346 100644 --- a/package_manager/src/Validator/SettingsValidator.php +++ b/package_manager/src/Validator/SettingsValidator.php @@ -25,9 +25,9 @@ final class SettingsValidator implements EventSubscriberInterface { use StringTranslationTrait; /** - * {@inheritdoc} + * Checks that Drupal's settings are valid for Package Manager. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { if (Settings::get('update_fetch_with_http_fallback')) { $event->addError([ $this->t('The <code>update_fetch_with_http_fallback</code> setting must be disabled.'), @@ -40,9 +40,9 @@ final class SettingsValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'validateStagePreOperation', - PreApplyEvent::class => 'validateStagePreOperation', - StatusCheckEvent::class => 'validateStagePreOperation', + PreCreateEvent::class => 'validate', + PreApplyEvent::class => 'validate', + StatusCheckEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/StageNotInActiveValidator.php b/package_manager/src/Validator/StageNotInActiveValidator.php index abc602e8fca3d12d9f0025b5b322466b6f92bf28..5c2f7c2134e9bf040fc90f603e0f350ca7396f96 100644 --- a/package_manager/src/Validator/StageNotInActiveValidator.php +++ b/package_manager/src/Validator/StageNotInActiveValidator.php @@ -35,7 +35,7 @@ class StageNotInActiveValidator implements EventSubscriberInterface { /** * Check if staging root is a subdirectory of active. */ - public function checkNotInActive(PreOperationStageEvent $event) { + public function validate(PreOperationStageEvent $event) { $project_root = $this->pathLocator->getProjectRoot(); $staging_root = $this->pathLocator->getStagingRoot(); if (str_starts_with($staging_root, $project_root)) { @@ -51,8 +51,8 @@ class StageNotInActiveValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'checkNotInActive', - StatusCheckEvent::class => 'checkNotInActive', + PreCreateEvent::class => 'validate', + StatusCheckEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/SupportedReleaseValidator.php b/package_manager/src/Validator/SupportedReleaseValidator.php index d16336fd427a8e7343b8fe038b250be04a95cd8b..5fc2e7deed3b4342819c6396bcf3505653d6c2f2 100644 --- a/package_manager/src/Validator/SupportedReleaseValidator.php +++ b/package_manager/src/Validator/SupportedReleaseValidator.php @@ -68,7 +68,7 @@ final class SupportedReleaseValidator implements EventSubscriberInterface { * @param \Drupal\package_manager\Event\PreApplyEvent $event * The event object. */ - public function checkStagedReleases(PreApplyEvent $event): void { + public function validate(PreApplyEvent $event): void { $active = $event->stage->getActiveComposer(); $staged = $event->stage->getStageComposer(); $updated_packages = array_merge( @@ -121,7 +121,7 @@ final class SupportedReleaseValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreApplyEvent::class => 'checkStagedReleases', + PreApplyEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/SymlinkValidator.php b/package_manager/src/Validator/SymlinkValidator.php index 3fd28881260ab30b244f80549ce30bd1bc0390f5..efc928bf95d6c3f859f03e6af695e14f00f080bf 100644 --- a/package_manager/src/Validator/SymlinkValidator.php +++ b/package_manager/src/Validator/SymlinkValidator.php @@ -53,9 +53,9 @@ class SymlinkValidator implements EventSubscriberInterface { ) {} /** - * {@inheritdoc} + * Flags errors if the project root or stage directory contain symbolic links. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { $active_dir = $this->pathFactory->create($this->pathLocator->getProjectRoot()); // The precondition requires us to pass both an active and stage directory, @@ -100,9 +100,9 @@ class SymlinkValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'validateStagePreOperation', - PreApplyEvent::class => 'validateStagePreOperation', - StatusCheckEvent::class => 'validateStagePreOperation', + PreCreateEvent::class => 'validate', + PreApplyEvent::class => 'validate', + StatusCheckEvent::class => 'validate', ]; } diff --git a/package_manager/src/Validator/WritableFileSystemValidator.php b/package_manager/src/Validator/WritableFileSystemValidator.php index 3b14ccad7bb41c4be0d899c3999cf4e107c2df5f..96d90f682ac75c5a209e6c65f0b781474addcfcc 100644 --- a/package_manager/src/Validator/WritableFileSystemValidator.php +++ b/package_manager/src/Validator/WritableFileSystemValidator.php @@ -34,14 +34,14 @@ class WritableFileSystemValidator implements EventSubscriberInterface { } /** - * {@inheritdoc} + * Checks that the file system is writable. * * @todo It might make sense to use a more sophisticated method of testing * writability than is_writable(), since it's not clear if that can return * false negatives/positives due to things like SELinux, exotic file * systems, and so forth. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { $messages = []; $drupal_root = $this->pathLocator->getProjectRoot(); @@ -94,9 +94,9 @@ class WritableFileSystemValidator implements EventSubscriberInterface { */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'validateStagePreOperation', - PreApplyEvent::class => 'validateStagePreOperation', - StatusCheckEvent::class => 'validateStagePreOperation', + PreCreateEvent::class => 'validate', + PreApplyEvent::class => 'validate', + StatusCheckEvent::class => 'validate', ]; } diff --git a/package_manager/tests/src/Kernel/ComposerJsonExistsValidatorTest.php b/package_manager/tests/src/Kernel/ComposerJsonExistsValidatorTest.php index 4a3434f13ea7b4d169d6d73b2e1bc8bb9ddd9cd9..6cfeae3f593dc3bf5949b4aa842aab0f057dc5a4 100644 --- a/package_manager/tests/src/Kernel/ComposerJsonExistsValidatorTest.php +++ b/package_manager/tests/src/Kernel/ComposerJsonExistsValidatorTest.php @@ -34,7 +34,7 @@ class ComposerJsonExistsValidatorTest extends PackageManagerKernelTestBase { 'No composer.json file can be found at <PROJECT_ROOT>'), ]); foreach ([PreCreateEvent::class, StatusCheckEvent::class] as $event_class) { - $this->assertEventPropagationStopped($event_class, [$this->container->get('package_manager.validator.composer_json_exists'), 'validateComposerJson']); + $this->assertEventPropagationStopped($event_class, [$this->container->get('package_manager.validator.composer_json_exists'), 'validate']); } $this->assertResults([$result], PreCreateEvent::class); $result = ValidationResult::createError( @@ -58,7 +58,7 @@ class ComposerJsonExistsValidatorTest extends PackageManagerKernelTestBase { unlink($this->container->get('package_manager.path_locator') ->getProjectRoot() . '/composer.json'); }); - $this->assertEventPropagationStopped(PreApplyEvent::class, [$this->container->get('package_manager.validator.composer_json_exists'), 'validateComposerJson']); + $this->assertEventPropagationStopped(PreApplyEvent::class, [$this->container->get('package_manager.validator.composer_json_exists'), 'validate']); $this->assertResults([$result], PreApplyEvent::class); } diff --git a/package_manager/tests/src/Kernel/EnvironmentSupportValidatorTest.php b/package_manager/tests/src/Kernel/EnvironmentSupportValidatorTest.php index 6d7c2546f7b68980c831c186f48f28bb6d1e3ca7..8707540cc276c7df3f56d83654e83672695827c2 100644 --- a/package_manager/tests/src/Kernel/EnvironmentSupportValidatorTest.php +++ b/package_manager/tests/src/Kernel/EnvironmentSupportValidatorTest.php @@ -27,7 +27,7 @@ class EnvironmentSupportValidatorTest extends PackageManagerKernelTestBase { t('Package Manager is not supported by your environment.'), ]); foreach ([PreCreateEvent::class, StatusCheckEvent::class] as $event_class) { - $this->assertEventPropagationStopped($event_class, [$this->container->get('package_manager.validator.environment_support'), 'validateStagePreOperation']); + $this->assertEventPropagationStopped($event_class, [$this->container->get('package_manager.validator.environment_support'), 'validate']); } $this->assertStatusCheckResults([$result]); $this->assertResults([$result], PreCreateEvent::class); @@ -45,7 +45,7 @@ class EnvironmentSupportValidatorTest extends PackageManagerKernelTestBase { 'Package Manager is not supported by your environment.', ]); - $this->assertEventPropagationStopped(PreApplyEvent::class, [$this->container->get('package_manager.validator.environment_support'), 'validateStagePreOperation']); + $this->assertEventPropagationStopped(PreApplyEvent::class, [$this->container->get('package_manager.validator.environment_support'), 'validate']); $this->assertResults([$result], PreApplyEvent::class); } diff --git a/package_manager/tests/src/Unit/StageNotInActiveValidatorTest.php b/package_manager/tests/src/Unit/StageNotInActiveValidatorTest.php index 219d3f5907aff8080691d499813335b8fa83df22..9bcffde9fd27b44f624bb76e1e176557a9b60c53 100644 --- a/package_manager/tests/src/Unit/StageNotInActiveValidatorTest.php +++ b/package_manager/tests/src/Unit/StageNotInActiveValidatorTest.php @@ -44,7 +44,7 @@ class StageNotInActiveValidatorTest extends UnitTestCase { $stage_not_in_active_validator = new StageNotInActiveValidator($path_locator); $stage_not_in_active_validator->setStringTranslation($this->getStringTranslationStub()); $event = new PreCreateEvent($stage, ['some/path']); - $stage_not_in_active_validator->checkNotInActive($event); + $stage_not_in_active_validator->validate($event); $this->assertValidationResultsEqual($expected, $event->getResults(), $path_locator); } diff --git a/src/Validator/ScaffoldFilePermissionsValidator.php b/src/Validator/ScaffoldFilePermissionsValidator.php index 6829f365459c3b8fb043fe83b31de138a0aad3e9..ab7b68d2d646fe04703b4ad3a8c989056a51da94 100644 --- a/src/Validator/ScaffoldFilePermissionsValidator.php +++ b/src/Validator/ScaffoldFilePermissionsValidator.php @@ -36,9 +36,9 @@ final class ScaffoldFilePermissionsValidator implements EventSubscriberInterface } /** - * {@inheritdoc} + * Validates that scaffold files have the appropriate permissions. */ - public function validateStagePreOperation(PreOperationStageEvent $event): void { + public function validate(PreOperationStageEvent $event): void { // We only want to do this check if the stage belongs to Automatic Updates. if (!$event->stage instanceof Updater) { return; @@ -123,9 +123,9 @@ final class ScaffoldFilePermissionsValidator implements EventSubscriberInterface */ public static function getSubscribedEvents(): array { return [ - PreCreateEvent::class => 'validateStagePreOperation', - PreApplyEvent::class => 'validateStagePreOperation', - StatusCheckEvent::class => 'validateStagePreOperation', + PreCreateEvent::class => 'validate', + PreApplyEvent::class => 'validate', + StatusCheckEvent::class => 'validate', ]; }