From e92a4080d8668ac536be691ea184c75b5de652ca Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Fri, 8 Jan 2021 12:47:14 +0000
Subject: [PATCH] Issue #3162822 by quietone, jungle, Abhijith S, catch,
longwave: Fix words with 'reference'
---
core/misc/cspell/dictionary.txt | 1 +
.../migrations/d6_field_instance_option_translation.yml | 2 +-
.../migrations/d6_field_option_translation.yml | 2 +-
core/modules/field/migrations/d6_field.yml | 2 +-
core/modules/field/migrations/d6_field_formatter_settings.yml | 2 +-
.../field/migrations/d6_field_instance_widget_settings.yml | 2 +-
.../field/src/Plugin/migrate/process/d6/FieldSettings.php | 2 --
.../tests/src/Kernel/Plugin/MigrationProvidersExistTest.php | 2 +-
.../migrations/state/migrate_drupal.migrate_drupal.yml | 2 +-
.../src/Plugin/migrate/field/d6/UserReference.php | 2 --
.../migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php | 2 +-
core/modules/views/src/Plugin/views/query/Sql.php | 4 ++--
core/modules/views/views.api.php | 4 ++--
13 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index 82406e02ad5c..ef568bce5d02 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -1837,6 +1837,7 @@ usecase
userid
userinfo
userref
+userreference
userspace
usuario
uuid's
diff --git a/core/modules/config_translation/migrations/d6_field_instance_option_translation.yml b/core/modules/config_translation/migrations/d6_field_instance_option_translation.yml
index 3ed2dda7bb80..be2bda62668b 100644
--- a/core/modules/config_translation/migrations/d6_field_instance_option_translation.yml
+++ b/core/modules/config_translation/migrations/d6_field_instance_option_translation.yml
@@ -1,4 +1,4 @@
-# cspell:ignore imagefield optionwidgets userreference
+# cspell:ignore imagefield optionwidgets
id: d6_field_instance_option_translation
label: Field instance option configuration translation
migration_tags:
diff --git a/core/modules/config_translation/migrations/d6_field_option_translation.yml b/core/modules/config_translation/migrations/d6_field_option_translation.yml
index cf68cf81eb5c..fcfabbeb7864 100644
--- a/core/modules/config_translation/migrations/d6_field_option_translation.yml
+++ b/core/modules/config_translation/migrations/d6_field_option_translation.yml
@@ -1,4 +1,4 @@
-# cspell:ignore imagefield optionwidgets userreference
+# cspell:ignore imagefield optionwidgets
id: d6_field_option_translation
label: Field option configuration translation
migration_tags:
diff --git a/core/modules/field/migrations/d6_field.yml b/core/modules/field/migrations/d6_field.yml
index 09e3f66b1346..99d016ccc8e8 100644
--- a/core/modules/field/migrations/d6_field.yml
+++ b/core/modules/field/migrations/d6_field.yml
@@ -1,4 +1,4 @@
-# cspell:ignore imagefield optionwidgets userreference
+# cspell:ignore imagefield optionwidgets
id: d6_field
label: Field configuration
migration_tags:
diff --git a/core/modules/field/migrations/d6_field_formatter_settings.yml b/core/modules/field/migrations/d6_field_formatter_settings.yml
index 8413332c5106..ba0620739f35 100644
--- a/core/modules/field/migrations/d6_field_formatter_settings.yml
+++ b/core/modules/field/migrations/d6_field_formatter_settings.yml
@@ -1,4 +1,4 @@
-# cspell:ignore imagelink userreference
+# cspell:ignore imagelink
id: d6_field_formatter_settings
label: Field formatter configuration
migration_tags:
diff --git a/core/modules/field/migrations/d6_field_instance_widget_settings.yml b/core/modules/field/migrations/d6_field_instance_widget_settings.yml
index 58b1e183eac5..815e8316b581 100644
--- a/core/modules/field/migrations/d6_field_instance_widget_settings.yml
+++ b/core/modules/field/migrations/d6_field_instance_widget_settings.yml
@@ -1,4 +1,4 @@
-# cspell:ignore imagefield optionwidgets userreference
+# cspell:ignore imagefield optionwidgets
id: d6_field_instance_widget_settings
label: Field instance widget configuration
migration_tags:
diff --git a/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php b/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
index ae6ecc03a7bf..e8cf7f5fa687 100644
--- a/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
+++ b/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
@@ -6,8 +6,6 @@
use Drupal\migrate\ProcessPluginBase;
use Drupal\migrate\Row;
-// cspell:ignore userreference
-
/**
* Get the field settings.
*
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php
index f8b4392de353..7445ae1ab285 100644
--- a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php
@@ -7,7 +7,7 @@
use Drupal\migrate_drupal\Plugin\MigrateFieldPluginManager;
use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
-// cspell:ignore imagefield optionwidgets userreference
+// cspell:ignore imagefield optionwidgets
/**
* Tests that modules exist for all source and destination plugins.
diff --git a/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml b/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml
index 7b60790fb0ef..b3b85e268894 100644
--- a/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml
+++ b/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml
@@ -1,7 +1,7 @@
# The modules listed here do not have an migration. A status of finished is
# assigned so that they appear in the will not be upgraded list on the Review
# form.
-# cspell:ignore imageapi imagemagick userreference
+# cspell:ignore imageapi imagemagick
finished:
6:
nodereference: core
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php
index 1fb2d040895b..b389f8b0b133 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php
@@ -5,8 +5,6 @@
use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate_drupal\Plugin\migrate\field\ReferenceBase;
-// cspell:ignore userreference
-
/**
* MigrateField Plugin for Drupal 6 user reference fields.
*
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
index f4af3d508d85..95496d446fa0 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
@@ -7,7 +7,7 @@
use Drupal\migrate_drupal\FieldDiscoveryInterface;
use Drupal\Tests\migrate_drupal\Traits\FieldDiscoveryTestTrait;
-// cspell:ignore imagefield imagelink selectlist userreference
+// cspell:ignore imagefield imagelink selectlist
/**
* Tests FieldDiscovery service against Drupal 6.
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index 009634308c20..96968b5e32b0 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -337,8 +337,8 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
* they must join either to the primary table or to a pre-existing
* relationship.
*
- * An example of a relationship would be a nodereference table.
- * If you have a nodereference named 'book_parent' which links to a
+ * An example of a relationship would be a node reference table.
+ * If you have a node reference named 'book_parent' which links to a
* parent node, you could set up a relationship 'node_book_parent'
* to 'node'. Then, anything that links to 'node' can link to
* 'node_book_parent' instead, thus allowing all properties of
diff --git a/core/modules/views/views.api.php b/core/modules/views/views.api.php
index 950a06cfeb77..aaceda71ba70 100644
--- a/core/modules/views/views.api.php
+++ b/core/modules/views/views.api.php
@@ -595,8 +595,8 @@ function hook_field_views_data_alter(array &$data, \Drupal\field\FieldStorageCon
* data. This allows a field type to add data that concerns its fields in
* other tables, which would not yet be defined at the point when
* hook_field_views_data() and hook_field_views_data_alter() are invoked. For
- * example, entityreference adds reverse relationships on the tables for the
- * entities which are referenced by entityreference fields.
+ * example, entity_reference adds reverse relationships on the tables for the
+ * entities which are referenced by entity_reference fields.
*
* (Note: this is weirdly named so as not to conflict with
* hook_field_views_data_alter().)
--
GitLab