From 76c0ec234ca7c7bf67df5e6f5ddb2a7ccadec253 Mon Sep 17 00:00:00 2001 From: Alex Pott <alex.a.pott@googlemail.com> Date: Thu, 27 Jan 2022 02:25:01 +0000 Subject: [PATCH] Issue #3219649 by quietone, murilohp, longwave: Fix spelling for words used once, beginning with 'q' -> 's', inclusive --- .../Scaffold/Operations/OperationFactory.php | 2 +- core/includes/form.inc | 2 +- core/includes/install.inc | 2 +- .../Drupal/Component/Version/Constraint.php | 2 +- core/lib/Drupal/Core/DrupalKernel.php | 3 ++- .../Drupal/Core/Form/FormBuilderInterface.php | 4 ++-- core/misc/cspell/dictionary.txt | 24 ------------------- .../src/Kernel/EditorImageDialogTest.php | 2 +- .../tests/src/Functional/FileUploadTest.php | 2 +- .../src/Plugin/migrate/process/UrlEncode.php | 2 +- .../src/Driver/Database/mysql/Connection.php | 2 +- core/modules/node/src/NodeViewsData.php | 2 +- .../src/FunctionalJavascript/FieldTest.php | 2 +- .../FieldableEntityNormalizerTrait.php | 3 ++- .../src/Kernel/EntitySerializationTest.php | 2 +- .../src/Plugin/ImageToolkit/GDToolkit.php | 2 ++ .../src/Kernel/Common/SystemListingTest.php | 2 +- .../test_views/views.view.test_user_path.yml | 2 +- .../Plugin/DisplayEntityReferenceTest.php | 2 +- .../Kernel/Plugin/ArgumentValidatorTest.php | 2 +- .../tests/src/Kernel/Plugin/StyleTest.php | 2 +- .../Plugin/display/PathPluginBaseTest.php | 2 +- .../Core/Asset/AttachedAssetsTest.php | 2 +- .../Annotation/MockFileFinderTest.php | 2 +- .../Tests/Component/Utility/CryptTest.php | 1 + .../Tests/Core/Ajax/AjaxCommandsTest.php | 2 +- .../Cache/Context/SessionCacheContextTest.php | 1 + 27 files changed, 30 insertions(+), 48 deletions(-) diff --git a/composer/Plugin/Scaffold/Operations/OperationFactory.php b/composer/Plugin/Scaffold/Operations/OperationFactory.php index 0f54a35c51c5..9b10f89fbfc3 100644 --- a/composer/Plugin/Scaffold/Operations/OperationFactory.php +++ b/composer/Plugin/Scaffold/Operations/OperationFactory.php @@ -44,7 +44,7 @@ public function __construct(Composer $composer) { * The scaffolding operation object (skip, replace, etc.) * * @throws \RuntimeException - * Exception thrown when parameter data does not identify a known scaffol + * Exception thrown when parameter data does not identify a known scaffold * operation. */ public function create(PackageInterface $package, OperationData $operation_data) { diff --git a/core/includes/form.inc b/core/includes/form.inc index d85ae6313d2d..9cd5f91daa0b 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -519,7 +519,7 @@ function template_preprocess_form_element(&$variables) { * this function will output no label (''). For required elements that have an * empty #title, this will output the required marker alone within the label. * The label will use the #id to associate the marker with the field that is - * required. That is especially important for screenreader users to know + * required. That is especially important for screen reader users to know * which field is required. * * To associate the label with a different field, set the #for property to the diff --git a/core/includes/install.inc b/core/includes/install.inc index 00a4a3459ed1..a590d8dacd08 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -1064,7 +1064,7 @@ function drupal_check_module($module) { * in a normal Drupal module .info.yml file. For example: * - name: The real name of the installation profile for display purposes. * - description: A brief description of the profile. - * - dependencies: An array of shortnames of other modules that this install + * - dependencies: An array of short names of other modules that this install * profile requires. * - install: An array of shortname of other modules to install that are not * required by this install profile. diff --git a/core/lib/Drupal/Component/Version/Constraint.php b/core/lib/Drupal/Component/Version/Constraint.php index 36a53eabb72e..d2f8af1a0f0a 100644 --- a/core/lib/Drupal/Component/Version/Constraint.php +++ b/core/lib/Drupal/Component/Version/Constraint.php @@ -80,7 +80,7 @@ public function isCompatible($version) { * Normally this is set to \Drupal::CORE_COMPATIBILITY by the caller. */ private function parseConstraint($constraint_string, $core_compatibility) { - // We use named subpatterns and support every op that version_compare + // We use named sub-patterns and support every op that version_compare // supports. Also, op is optional and defaults to equals. $p_op = '(?<operation>!=|==|=|<|<=|>|>=|<>)?'; // Core version is always optional: 8.x-2.x and 2.x is treated the same. diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index 485c3ce9e4a8..f57a83a9604e 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -1251,7 +1251,8 @@ protected function compileContainer() { // Identify all services whose instances should be persisted when rebuilding // the container during the lifetime of the kernel (e.g., during a kernel // reboot). Include synthetic services, because by definition, they cannot - // be automatically reinstantiated. Also include services tagged to persist. + // be automatically re-instantiated. Also include services tagged to + // persist. $persist_ids = []; foreach ($container->getDefinitions() as $id => $definition) { // It does not make sense to persist the container itself, exclude it. diff --git a/core/lib/Drupal/Core/Form/FormBuilderInterface.php b/core/lib/Drupal/Core/Form/FormBuilderInterface.php index bcdc9b1a3b7e..b3d4f3556cc7 100644 --- a/core/lib/Drupal/Core/Form/FormBuilderInterface.php +++ b/core/lib/Drupal/Core/Form/FormBuilderInterface.php @@ -140,8 +140,8 @@ public function rebuildForm($form_id, FormStateInterface &$form_state, $old_form * @code * // register a new user * $form_state = new FormState(); - * $values['name'] = 'robo-user'; - * $values['mail'] = 'robouser@example.com'; + * $values['name'] = 'some-user'; + * $values['mail'] = 'someuser@example.com'; * $values['pass']['pass1'] = 'password'; * $values['pass']['pass2'] = 'password'; * $values['op'] = t('Create new account'); diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt index 3c1684bd4084..aefa09d26c47 100644 --- a/core/misc/cspell/dictionary.txt +++ b/core/misc/cspell/dictionary.txt @@ -1089,7 +1089,6 @@ pvde pwprompt queryor querystring -querystrings questionmark quickedit quickediting @@ -1110,7 +1109,6 @@ rasterize rasterized rasterizes rawurlencoded -rawurlencoding rdfa rdfs readmore @@ -1136,10 +1134,8 @@ refinable regexes rehydrated reimplement -reimplementing reindex reindexing -reinitializes reinject reinstantiated removeformat @@ -1154,7 +1150,6 @@ resampling resave resaved resaving -rescan resizer restplugin restrictor @@ -1163,7 +1158,6 @@ restriped restui rethrown returntransfer -reuploading revisionability revisionable revisioned @@ -1174,47 +1168,37 @@ revpub ribisi ritchie robloach -robo rolename roly routable routeable -routename rowspans -rowtest rpos -rrggbb rsyslog rtsp ruleset rulesets -rxpq répét répété safa -safed sameline samename sameorigin -sapere sata savepoints sayre -scaffol scarlett schemaapi schemaless schemeless schipulcon scorewords -screenreader screenreaders scriptable scrollbars sdeeeee searchdirs searchfield -searchpages sebe secondcolumn seld @@ -1227,7 +1211,6 @@ sharedspace shatner shorterthan shortlink -shortnames showblocks sidebarborders siema @@ -1253,16 +1236,12 @@ sloopal smacss smalldatetime smallint -someclass somecompany -somefile somelinks somemodule someplugin someschema -sometext somethinggeneric -soofy sortablejs sortby sourcearea @@ -1289,7 +1268,6 @@ ssid stardivision starrrrr starterkit -startpunt starzzzz statuscode stdclass @@ -1299,7 +1277,6 @@ streamwrapper streamwrappers strikethrough stringable -stringis striptags strs sttid @@ -1324,7 +1301,6 @@ subkeys submenu submenus subparse -subpatterns subplugins subproject subprojects diff --git a/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php b/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php index 46a3210ac7d0..45cf9cd9471b 100644 --- a/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php +++ b/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php @@ -86,7 +86,7 @@ protected function setUp(): void { public function testEditorImageDialog() { $input = [ 'editor_object' => [ - 'src' => '/sites/default/files/inline-images/somefile.png', + 'src' => '/sites/default/files/inline-images/some-file.png', 'alt' => 'fda', 'width' => '', 'height' => '', diff --git a/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php b/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php index 415b717dceda..8d6908302a91 100644 --- a/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php +++ b/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php @@ -309,7 +309,7 @@ public function testPostFileUploadAndUseInSingleRequest() { $this->setUpAuthorization('GET'); - // Reuploading the same file will result in the file being uploaded twice + // Re-uploading the same file will result in the file being uploaded twice // and referenced twice. $response = $this->fileRequest($uri, $this->testFileData); $this->assertSame(200, $response->getStatusCode()); diff --git a/core/modules/migrate/src/Plugin/migrate/process/UrlEncode.php b/core/modules/migrate/src/Plugin/migrate/process/UrlEncode.php index 4e385602f46a..be7b2e150eb7 100644 --- a/core/modules/migrate/src/Plugin/migrate/process/UrlEncode.php +++ b/core/modules/migrate/src/Plugin/migrate/process/UrlEncode.php @@ -43,7 +43,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable if ($parsed_url === FALSE) { throw new MigrateException("Value '$value' is not a valid URL"); } - // Iterate over specific pieces of the URL rawurlencoding each one. + // Iterate over specific pieces of the URL raw URL encoding each one. $url_parts_to_encode = ['path', 'query', 'fragment']; foreach ($parsed_url as $parsed_url_key => $parsed_url_value) { if (in_array($parsed_url_key, $url_parts_to_encode)) { diff --git a/core/modules/mysql/src/Driver/Database/mysql/Connection.php b/core/modules/mysql/src/Driver/Database/mysql/Connection.php index e15575bcb063..73cc29f18db1 100644 --- a/core/modules/mysql/src/Driver/Database/mysql/Connection.php +++ b/core/modules/mysql/src/Driver/Database/mysql/Connection.php @@ -332,7 +332,7 @@ public function nextIdDelete() { // much storage and memory, we must keep the highest value in the table // because InnoDB uses an in-memory auto-increment counter as long as the // server runs. When the server is stopped and restarted, InnoDB - // reinitializes the counter for each table for the first INSERT to the + // re-initializes the counter for each table for the first INSERT to the // table based solely on values from the table so deleting all values would // be a problem in this case. Also, TRUNCATE resets the auto increment // counter. diff --git a/core/modules/node/src/NodeViewsData.php b/core/modules/node/src/NodeViewsData.php index 5c1d34cc74d3..e47dc03d8f17 100644 --- a/core/modules/node/src/NodeViewsData.php +++ b/core/modules/node/src/NodeViewsData.php @@ -278,7 +278,7 @@ public function getViewsData() { if (\Drupal::moduleHandler()->moduleExists('search')) { $enabled = FALSE; $search_page_repository = \Drupal::service('search.search_page_repository'); - foreach ($search_page_repository->getActiveSearchpages() as $page) { + foreach ($search_page_repository->getActiveSearchPages() as $page) { if ($page->getPlugin()->getPluginId() == 'node_search') { $enabled = TRUE; break; diff --git a/core/modules/quickedit/tests/src/FunctionalJavascript/FieldTest.php b/core/modules/quickedit/tests/src/FunctionalJavascript/FieldTest.php index fae1a9fe0879..6896f04a3d5a 100644 --- a/core/modules/quickedit/tests/src/FunctionalJavascript/FieldTest.php +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/FieldTest.php @@ -73,7 +73,7 @@ protected function setUp(): void { * Tests that quickeditor works correctly for field with CKEditor. */ public function testFieldWithCkeditor() { - $body_value = '<p>Sapere aude</p>'; + $body_value = '<p>Dare to be wise</p>'; $node = Node::create([ 'type' => 'page', 'title' => 'Page node', diff --git a/core/modules/serialization/src/Normalizer/FieldableEntityNormalizerTrait.php b/core/modules/serialization/src/Normalizer/FieldableEntityNormalizerTrait.php index 379d0f9d8a79..bc5070444690 100644 --- a/core/modules/serialization/src/Normalizer/FieldableEntityNormalizerTrait.php +++ b/core/modules/serialization/src/Normalizer/FieldableEntityNormalizerTrait.php @@ -188,7 +188,8 @@ protected function getEntityTypeManager() { * * Most normalizers that extend this class can simply use this method to * construct the denormalized value without having to override denormalize() - * and reimplementing its validation logic or its call to set the field value. + * and re-implementing its validation logic or its call to set the field + * value. * * It's recommended to not override this and instead provide a (de)normalizer * at the DataType level. diff --git a/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php b/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php index 47e8ca222b06..6e997dd016eb 100644 --- a/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php +++ b/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php @@ -207,7 +207,7 @@ public function testUserNormalize() { } /** - * Tests registered Serializer's entity serialization for core's formats. + * Tests entity serialization for core's formats by a registered Serializer. */ public function testSerialize() { // Test that Serializer responds using the ComplexDataNormalizer and diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php index 4c95e1c5af3a..9218ae3ce686 100644 --- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php +++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php @@ -15,6 +15,8 @@ use Psr\Log\LoggerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; +// cspell:ignore rrggbb + /** * Defines the GD2 toolkit for image manipulation within Drupal. * diff --git a/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php b/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php index 0a485896f252..102247ee3ccd 100644 --- a/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php +++ b/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php @@ -59,7 +59,7 @@ public function testFileScanIgnoreDirectory() { $files = $listing->scan('module'); $this->assertArrayHasKey('drupal_system_listing_compatible_test', $files); - // Reset the static to force a rescan of the directories. + // Reset the static to force a re-scan of the directories. $reflected_class = new \ReflectionClass(ExtensionDiscovery::class); $reflected_property = $reflected_class->getProperty('files'); $reflected_property->setAccessible(TRUE); diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_user_path.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_user_path.yml index 66de53e98c87..c0bbd1b8e64c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_user_path.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_user_path.yml @@ -56,7 +56,7 @@ display: items_per_page_options_all: false items_per_page_options_all_label: '- All -' offset: false - offset_label: Startpunt + offset_label: 'Start point' tags: previous: ‹‹ next: ›› diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php index 19a131988097..3cd787fc10ec 100644 --- a/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php @@ -122,7 +122,7 @@ protected function setUp($import_test_views = TRUE): void { EntityTest::create([ 'bundle' => 'entity_test', 'name' => 'name', - $this->fieldName => 'sometext', + $this->fieldName => 'some_text', ])->save(); } diff --git a/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php b/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php index 657b576649a3..ce2ae6751523 100644 --- a/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php +++ b/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php @@ -24,7 +24,7 @@ public function testArgumentValidateNumeric() { $view = Views::getView('test_view_argument_validate_numeric'); $view->initHandlers(); $this->assertFalse($view->argument['null']->validateArgument($this->randomString())); - // Reset safed argument validation. + // Reset saved argument validation. $view->argument['null']->argument_validated = NULL; $this->assertTrue($view->argument['null']->validateArgument(12)); } diff --git a/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php b/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php index 364fdc75289b..d83384459e62 100644 --- a/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php +++ b/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php @@ -42,7 +42,7 @@ public function testStyle() { $view->initStyle(); // Reinitialize the style as it supports row plugins now. $view->style_plugin->init($view, $view->display_handler); - $this->assertInstanceOf(Rowtest::class, $view->rowPlugin); + $this->assertInstanceOf(RowTest::class, $view->rowPlugin); $random_text = $this->randomMachineName(); $view->rowPlugin->setOutput($random_text); diff --git a/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php index 6c67ab2e3fc4..17369481a2e3 100644 --- a/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php @@ -533,7 +533,7 @@ public function testGetRouteName() { ]; $this->pathPlugin->initDisplay($view, $display); $route_name = $this->pathPlugin->getRouteName(); - // Ensure that the expected routename is returned. + // Ensure that the expected route name is returned. $this->assertEquals('view.test_id.page_1', $route_name); } diff --git a/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php b/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php index 54700f93f05e..a65139585e1c 100644 --- a/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php +++ b/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php @@ -467,7 +467,7 @@ public function testLibraryNameConflicts() { } /** - * Tests JavaScript files that have querystrings attached get added right. + * Tests JavaScript files that have query strings attached get added right. */ public function testAddJsFileWithQueryString() { $build['#attached']['library'][] = 'common_test/querystring'; diff --git a/core/tests/Drupal/Tests/Component/Annotation/MockFileFinderTest.php b/core/tests/Drupal/Tests/Component/Annotation/MockFileFinderTest.php index 697551c33a53..f1983ffcd917 100644 --- a/core/tests/Drupal/Tests/Component/Annotation/MockFileFinderTest.php +++ b/core/tests/Drupal/Tests/Component/Annotation/MockFileFinderTest.php @@ -18,7 +18,7 @@ class MockFileFinderTest extends TestCase { public function testFindFile() { $tmp = MockFileFinder::create('testfilename.txt'); $this->assertEquals('testfilename.txt', $tmp->findFile('n/a')); - $this->assertEquals('testfilename.txt', $tmp->findFile('someclass')); + $this->assertEquals('testfilename.txt', $tmp->findFile('SomeClass')); } } diff --git a/core/tests/Drupal/Tests/Component/Utility/CryptTest.php b/core/tests/Drupal/Tests/Component/Utility/CryptTest.php index 5b3397bbdf80..f2ff256193bc 100644 --- a/core/tests/Drupal/Tests/Component/Utility/CryptTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/CryptTest.php @@ -73,6 +73,7 @@ public function providerTestHashBase64() { return [ [ 'data' => 'The SHA (Secure Hash Algorithm) is one of a number of cryptographic hash functions. A cryptographic hash is like a signature for a text or a data file. SHA-256 algorithm generates an almost-unique, fixed size 256-bit (32-byte) hash. Hash is a one way function – it cannot be decrypted back. This makes it suitable for password validation, challenge hash authentication, anti-tamper, digital signatures.', + // cspell:disable-next-line 'expectedHash' => '034rT6smZAVRxpq8O98cFFNLIVx_Ph1EwLZQKcmRR_s', ], [ diff --git a/core/tests/Drupal/Tests/Core/Ajax/AjaxCommandsTest.php b/core/tests/Drupal/Tests/Core/Ajax/AjaxCommandsTest.php index fcaa36913353..c482a0211976 100644 --- a/core/tests/Drupal/Tests/Core/Ajax/AjaxCommandsTest.php +++ b/core/tests/Drupal/Tests/Core/Ajax/AjaxCommandsTest.php @@ -485,7 +485,7 @@ public function testRedirectCommand() { * @covers \Drupal\Core\Ajax\UpdateBuildIdCommand */ public function testUpdateBuildIdCommand() { - $old = 'ThisStringisOld'; + $old = 'ThisStringIsOld'; $new = 'ThisStringIsNew'; $command = new UpdateBuildIdCommand($old, $new); $expected = [ diff --git a/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php b/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php index b23090b582b2..f2f2acaad78c 100644 --- a/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php +++ b/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php @@ -69,6 +69,7 @@ public function testDifferentContextForDifferentSession() { $this->request->setSession($this->session); $cache_context = new SessionCacheContext($this->requestStack); + // cspell:disable-next-line $session1_id = 'pjH_8aSoofyCDQiuVYXJcbfyr-CPtkUY'; $session2_id = 'aSebeZ52bbM6SvADurQP89SFnEpxY6j8'; $this->session->expects($this->exactly(2)) -- GitLab