From 1a7b960d95e58b18717f010f33d331c076618ed1 Mon Sep 17 00:00:00 2001 From: Ted Bowman <ted+git@tedbow.com> Date: Fri, 30 Sep 2022 19:18:59 +0200 Subject: [PATCH] cspell fixes --- core/modules/auto_updates/auto_updates.module | 2 +- core/modules/auto_updates/src/ReleaseChooser.php | 2 +- .../new_project_added/active/vendor/composer/installed.json | 2 +- .../new_project_added/staged/vendor/composer/installed.json | 2 +- .../no_errors/active/vendor/composer/installed.json | 2 +- .../no_errors/staged/vendor/composer/installed.json | 2 +- .../project_removed/active/vendor/composer/installed.json | 2 +- .../project_removed/staged/vendor/composer/installed.json | 2 +- .../version_changed/active/vendor/composer/installed.json | 2 +- .../version_changed/staged/vendor/composer/installed.json | 2 +- .../tests/modules/auto_updates_test/auto_updates_test.module | 2 +- .../auto_updates/tests/src/Functional/UpdaterFormTest.php | 4 ++-- .../ReadinessValidation/StagedProjectsValidatorTest.php | 2 +- core/modules/package_manager/package_manager.module | 2 ++ core/modules/package_manager/src/Event/RequireEventTrait.php | 4 ++-- core/modules/package_manager/src/FailureMarker.php | 2 +- core/modules/package_manager/src/ProcessFactory.php | 1 + .../tests/src/Kernel/StageValidationExceptionTest.php | 2 +- .../tests/src/Unit/InstalledPackagesDataTest.php | 2 +- .../package_manager/tests/src/Unit/PathLocatorTest.php | 4 ++-- 20 files changed, 24 insertions(+), 21 deletions(-) diff --git a/core/modules/auto_updates/auto_updates.module b/core/modules/auto_updates/auto_updates.module index 464dbbf7c3c0..77c034f61bc8 100644 --- a/core/modules/auto_updates/auto_updates.module +++ b/core/modules/auto_updates/auto_updates.module @@ -109,7 +109,7 @@ function auto_updates_module_implements_alter(&$implementations, $hook) { unset($implementations['update']); } if ($hook === 'cron') { - // Whatever mofo. + // Whatever. $hook = $implementations['auto_updates']; unset($implementations['auto_updates']); $implementations['auto_updates'] = $hook; diff --git a/core/modules/auto_updates/src/ReleaseChooser.php b/core/modules/auto_updates/src/ReleaseChooser.php index 7fc2b66b7f68..ad19eb118df3 100644 --- a/core/modules/auto_updates/src/ReleaseChooser.php +++ b/core/modules/auto_updates/src/ReleaseChooser.php @@ -47,7 +47,7 @@ public function __construct(VersionPolicyValidator $version_policy_validator) { * The updater that will be used to install the releases. * * @return \Drupal\update\ProjectRelease[] - * The releases that are installable by the given updtaer, according to the + * The releases that are installable by the given updater, according to the * version validator service. */ protected function getInstallableReleases(Updater $updater): array { diff --git a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/new_project_added/active/vendor/composer/installed.json b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/new_project_added/active/vendor/composer/installed.json index bc87d26d79de..7d023c9e987c 100644 --- a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/new_project_added/active/vendor/composer/installed.json +++ b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/new_project_added/active/vendor/composer/installed.json @@ -1,6 +1,6 @@ { "_readme": [ - "This file simuluates a list of packages installed in the active directory of a virtual project.", + "This file simulates a list of packages installed in the active directory of a virtual project.", "It will be compared against staged.installed.json.", "See \\Drupal\\Tests\\auto_updates\\Kernel\\ReadinessValidation\\StagedProjectsValidatorTest::testErrors()" ], diff --git a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/new_project_added/staged/vendor/composer/installed.json b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/new_project_added/staged/vendor/composer/installed.json index a485678d2278..75ca62dff3f1 100644 --- a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/new_project_added/staged/vendor/composer/installed.json +++ b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/new_project_added/staged/vendor/composer/installed.json @@ -1,6 +1,6 @@ { "_readme": [ - "This file simuluates a list of packages installed in a virtual staging area.", + "This file simulates a list of packages installed in a virtual staging area.", "It will be compared against active.installed.json.", "See \\Drupal\\Tests\\auto_updates\\Kernel\\ReadinessValidation\\StagedProjectsValidatorTest::testErrors()" ], diff --git a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/no_errors/active/vendor/composer/installed.json b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/no_errors/active/vendor/composer/installed.json index 4005167f65a3..1ce420f91334 100644 --- a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/no_errors/active/vendor/composer/installed.json +++ b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/no_errors/active/vendor/composer/installed.json @@ -1,6 +1,6 @@ { "_readme": [ - "This file simuluates a list of packages installed in the active directory of a virtual project.", + "This file simulates a list of packages installed in the active directory of a virtual project.", "It will be compared against staged.installed.json.", "See \\Drupal\\Tests\\auto_updates\\Kernel\\ReadinessValidation\\StagedProjectsValidatorTest::testErrors()" ], diff --git a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/no_errors/staged/vendor/composer/installed.json b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/no_errors/staged/vendor/composer/installed.json index 317eff012aea..aae27341f80d 100644 --- a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/no_errors/staged/vendor/composer/installed.json +++ b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/no_errors/staged/vendor/composer/installed.json @@ -1,6 +1,6 @@ { "_readme": [ - "This file simuluates a list of packages installed in a virtual staging area.", + "This file simulates a list of packages installed in a virtual staging area.", "It will be compared against active.installed.json.", "See \\Drupal\\Tests\\auto_updates\\Kernel\\ReadinessValidation\\StagedProjectsValidatorTest::testErrors()" ], diff --git a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/project_removed/active/vendor/composer/installed.json b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/project_removed/active/vendor/composer/installed.json index 08242008b82c..6c78f4198c08 100644 --- a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/project_removed/active/vendor/composer/installed.json +++ b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/project_removed/active/vendor/composer/installed.json @@ -1,6 +1,6 @@ { "_readme": [ - "This file simuluates a list of packages installed in the active directory of a virtual project.", + "This file simulates a list of packages installed in the active directory of a virtual project.", "It will be compared against staged.installed.json.", "See \\Drupal\\Tests\\auto_updates\\Kernel\\ReadinessValidation\\StagedProjectsValidatorTest::testErrors()" ], diff --git a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/project_removed/staged/vendor/composer/installed.json b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/project_removed/staged/vendor/composer/installed.json index 9e91821930a9..c7892ad98882 100644 --- a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/project_removed/staged/vendor/composer/installed.json +++ b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/project_removed/staged/vendor/composer/installed.json @@ -1,6 +1,6 @@ { "_readme": [ - "This file simuluates a list of packages installed in a virtual staging area.", + "This file simulates a list of packages installed in a virtual staging area.", "It will be compared against active.installed.json.", "See \\Drupal\\Tests\\auto_updates\\Kernel\\ReadinessValidation\\StagedProjectsValidatorTest::testErrors()" ], diff --git a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/version_changed/active/vendor/composer/installed.json b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/version_changed/active/vendor/composer/installed.json index b4f51c18de2b..0f0a7d245c4e 100644 --- a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/version_changed/active/vendor/composer/installed.json +++ b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/version_changed/active/vendor/composer/installed.json @@ -1,6 +1,6 @@ { "_readme": [ - "This file simuluates a list of packages installed in the active directory of a virtual project.", + "This file simulates a list of packages installed in the active directory of a virtual project.", "It will be compared against staged.installed.json.", "See \\Drupal\\Tests\\auto_updates\\Kernel\\ReadinessValidation\\StagedProjectsValidatorTest::testErrors()" ], diff --git a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/version_changed/staged/vendor/composer/installed.json b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/version_changed/staged/vendor/composer/installed.json index 9f6db978918b..74fdba6a8f02 100644 --- a/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/version_changed/staged/vendor/composer/installed.json +++ b/core/modules/auto_updates/tests/fixtures/StagedProjectsValidatorTest/version_changed/staged/vendor/composer/installed.json @@ -1,6 +1,6 @@ { "_readme": [ - "This file simuluates a list of packages installed in a virtual staging area.", + "This file simulates a list of packages installed in a virtual staging area.", "It will be compared against active.installed.json.", "See \\Drupal\\Tests\\auto_updates\\Kernel\\ReadinessValidation\\StagedProjectsValidatorTest::testErrors()" ], diff --git a/core/modules/auto_updates/tests/modules/auto_updates_test/auto_updates_test.module b/core/modules/auto_updates/tests/modules/auto_updates_test/auto_updates_test.module index 719ffea93fa7..628581ca190d 100644 --- a/core/modules/auto_updates/tests/modules/auto_updates_test/auto_updates_test.module +++ b/core/modules/auto_updates/tests/modules/auto_updates_test/auto_updates_test.module @@ -14,7 +14,7 @@ function auto_updates_test_mail_alter(array &$message): void { if (str_starts_with($message['id'], 'auto_updates_')) { $line_langcodes = []; - // Get the langcode of every translated line in the mssage, including the + // Get the langcode of every translated line in the message, including the // subject line. $lines = array_merge($message['body'], [ $message['subject'], diff --git a/core/modules/auto_updates/tests/src/Functional/UpdaterFormTest.php b/core/modules/auto_updates/tests/src/Functional/UpdaterFormTest.php index 40e460bf9bca..c242fdfd0a58 100644 --- a/core/modules/auto_updates/tests/src/Functional/UpdaterFormTest.php +++ b/core/modules/auto_updates/tests/src/Functional/UpdaterFormTest.php @@ -332,7 +332,7 @@ public function testMarkerFileFailure(): void { $this->checkForMetaRefresh(); $this->assertUpdateStagedTimes(1); - Committer::setException(new \Exception('failed at commiter')); + Committer::setException(new \Exception('failed at committer')); $page->pressButton('Continue'); $this->checkForMetaRefresh(); $assert_session->pageTextContainsOnce('An error has occurred.'); @@ -774,7 +774,7 @@ public function testNoContinueOnError(): void { $page->pressButton('Update to 9.8.1'); $this->checkForMetaRefresh(); $this->assertUpdateStagedTimes(1); - $error = ValidationResult::createError(['Error occured.']); + $error = ValidationResult::createError(['Error occurred.']); TestSubscriber::setTestResult([$error], StatusCheckEvent::class); $this->getSession()->reload(); $assert_session->buttonNotExists('Continue'); diff --git a/core/modules/auto_updates/tests/src/Kernel/ReadinessValidation/StagedProjectsValidatorTest.php b/core/modules/auto_updates/tests/src/Kernel/ReadinessValidation/StagedProjectsValidatorTest.php index 089cf95bb407..c1cc9c90ef25 100644 --- a/core/modules/auto_updates/tests/src/Kernel/ReadinessValidation/StagedProjectsValidatorTest.php +++ b/core/modules/auto_updates/tests/src/Kernel/ReadinessValidation/StagedProjectsValidatorTest.php @@ -81,7 +81,7 @@ public function testEventConsumesExceptionResults(): void { * Tests validation errors, or lack thereof. * * @param string $root_fixture_directory - * A directory containing to fixtures sub direcotories, 'active' and + * A directory containing to fixtures sub-directories, 'active' and * 'staged'. * @param string|null $expected_summary * The expected error summary, or NULL if no errors are expected. diff --git a/core/modules/package_manager/package_manager.module b/core/modules/package_manager/package_manager.module index c46e1a20983f..569a65cbde6c 100644 --- a/core/modules/package_manager/package_manager.module +++ b/core/modules/package_manager/package_manager.module @@ -8,6 +8,8 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\package_manager\Validator\ComposerExecutableValidator; +// cspell:ignore grasmash + /** * Implements hook_help(). */ diff --git a/core/modules/package_manager/src/Event/RequireEventTrait.php b/core/modules/package_manager/src/Event/RequireEventTrait.php index f93853967311..96d4c0d3bf21 100644 --- a/core/modules/package_manager/src/Event/RequireEventTrait.php +++ b/core/modules/package_manager/src/Event/RequireEventTrait.php @@ -35,9 +35,9 @@ trait RequireEventTrait { * The stage. * @param string[] $runtime_packages * The runtime (i.e., non-dev) packages to be required, in the form - * 'vendor/name:constrant'. + * 'vendor/name:constraint'. * @param string[] $dev_packages - * The dev packages to be required, in the form 'vendor/name:constrant'. + * The dev packages to be required, in the form 'vendor/name:constraint'. */ public function __construct(Stage $stage, array $runtime_packages, array $dev_packages = []) { $this->runtimePackages = $runtime_packages; diff --git a/core/modules/package_manager/src/FailureMarker.php b/core/modules/package_manager/src/FailureMarker.php index 14b5ee90e51c..296cb87827da 100644 --- a/core/modules/package_manager/src/FailureMarker.php +++ b/core/modules/package_manager/src/FailureMarker.php @@ -12,7 +12,7 @@ * code is copied back into it, and then removed afterwards. This allows us to * know if a commit operation failed midway through, which could leave the site * code base in an indeterminate state -- which, in the worst case scenario, - * might render Drupal unbootable. + * might render Drupal unable to boot. */ final class FailureMarker { diff --git a/core/modules/package_manager/src/ProcessFactory.php b/core/modules/package_manager/src/ProcessFactory.php index e3cfd03514c5..12d73bec27de 100644 --- a/core/modules/package_manager/src/ProcessFactory.php +++ b/core/modules/package_manager/src/ProcessFactory.php @@ -8,6 +8,7 @@ use PhpTuf\ComposerStager\Infrastructure\Factory\Process\ProcessFactory as StagerProcessFactory; use Symfony\Component\Process\Process; +// cspell:ignore BINDIR /** * Defines a process factory which sets the COMPOSER_HOME environment variable. * diff --git a/core/modules/package_manager/tests/src/Kernel/StageValidationExceptionTest.php b/core/modules/package_manager/tests/src/Kernel/StageValidationExceptionTest.php index 71e6f89785e0..c3b577ffbf0f 100644 --- a/core/modules/package_manager/tests/src/Kernel/StageValidationExceptionTest.php +++ b/core/modules/package_manager/tests/src/Kernel/StageValidationExceptionTest.php @@ -28,7 +28,7 @@ class StageValidationExceptionTest extends PackageManagerKernelTestBase { * The test cases. */ public function providerResultsAsText(): array { - $messages = ['Blam!', 'Kapow!']; + $messages = ['Bang!', 'Pow!']; $summary = t('There was sadness.'); $result_no_summary = ValidationResult::createError([$messages[0]]); diff --git a/core/modules/package_manager/tests/src/Unit/InstalledPackagesDataTest.php b/core/modules/package_manager/tests/src/Unit/InstalledPackagesDataTest.php index 606d2e2fa739..eb4a859e7b4f 100644 --- a/core/modules/package_manager/tests/src/Unit/InstalledPackagesDataTest.php +++ b/core/modules/package_manager/tests/src/Unit/InstalledPackagesDataTest.php @@ -19,7 +19,7 @@ class InstalledPackagesDataTest extends UnitTestCase { /** * Tests that Composer's `installed.php` file looks how we expect. */ - public function testinstalledPackagesData(): void { + public function testInstalledPackagesData(): void { $loaders = ClassLoader::getRegisteredLoaders(); $installed_php = key($loaders) . '/composer/installed.php'; $this->assertFileIsReadable($installed_php); diff --git a/core/modules/package_manager/tests/src/Unit/PathLocatorTest.php b/core/modules/package_manager/tests/src/Unit/PathLocatorTest.php index 540a35900f6a..0579f4ed396b 100644 --- a/core/modules/package_manager/tests/src/Unit/PathLocatorTest.php +++ b/core/modules/package_manager/tests/src/Unit/PathLocatorTest.php @@ -20,7 +20,7 @@ class PathLocatorTest extends UnitTestCase { public function testStagingRoot(): void { $config_factory = $this->getConfigFactoryStub([ 'system.site' => [ - 'uuid' => 'my_site_id', + 'uuid' => '_my_site_id', ], ]); $file_system = $this->prophesize(FileSystemInterface::class); @@ -31,7 +31,7 @@ public function testStagingRoot(): void { $config_factory, $file_system->reveal() ); - $this->assertSame('/path/to/temp/.package_managermy_site_id', $path_locator->getStagingRoot()); + $this->assertSame('/path/to/temp/.package_manager_my_site_id', $path_locator->getStagingRoot()); } /** -- GitLab