From 30410d3393dad09a401200bab71e5de07fca18fc Mon Sep 17 00:00:00 2001
From: DuttonMa <duttonma@gmail.com>
Date: Thu, 17 Oct 2024 11:04:06 +0100
Subject: [PATCH 1/4] Add schema for settings form

---
 origins_common/config/schema/origins_common.schema.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/origins_common/config/schema/origins_common.schema.yml b/origins_common/config/schema/origins_common.schema.yml
index 4e1da8d0..ecc7e26f 100644
--- a/origins_common/config/schema/origins_common.schema.yml
+++ b/origins_common/config/schema/origins_common.schema.yml
@@ -10,3 +10,10 @@ field.formatter.settings.html_list_formatter:
     display_item_link:
       type: boolean
       label: 'Display item link'
+
+filter_settings.origins_media_cookie_content_blocker_embed_filter:
+  type: mapping
+  mapping:
+    replacement_text:
+      type: string
+      label: 'Replacement text'

From f1cae8172f026ea084f853ad6cfaecebd00d19a3 Mon Sep 17 00:00:00 2001
From: DuttonMa <duttonma@gmail.com>
Date: Thu, 17 Oct 2024 11:36:47 +0100
Subject: [PATCH 2/4] Defensive coding to avoid 'undefined index' warnings

---
 .../Controller/OriginsTranslationsAdminController.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/origins_translations/src/Controller/OriginsTranslationsAdminController.php b/origins_translations/src/Controller/OriginsTranslationsAdminController.php
index c2d716f2..4f7f4fe2 100644
--- a/origins_translations/src/Controller/OriginsTranslationsAdminController.php
+++ b/origins_translations/src/Controller/OriginsTranslationsAdminController.php
@@ -77,12 +77,12 @@ public function languages() {
             ],
           ],
         ],
-        $language['0'],
+        isset($language['0']) ? $language['0'] : NULL,
         ($language['1']) ? $this->t('True') : $this->t('False'),
-        $language['2'],
-        $language['3'],
-        $language['4'],
-        $language['5'],
+        isset($language['2']) ? $language['2'] : NULL,
+        isset($language['3']) ? $language['3'] : NULL,
+        isset($language['4']) ? $language['4'] : NULL,
+        isset($language['5']) ? $language['5'] : NULL,
       ];
     }
 

From 1edcfa6c7a5b49139a62f39fae7e80aac59eb9c4 Mon Sep 17 00:00:00 2001
From: DuttonMa <duttonma@gmail.com>
Date: Thu, 17 Oct 2024 13:43:32 +0100
Subject: [PATCH 3/4] Avoid tedious alphabetical use statement error

---
 .../origins_ckeditor_enhancements.module                       | 2 +-
 origins_common/origins_common.module                           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/origins_ckeditor_enhancements/origins_ckeditor_enhancements.module b/origins_ckeditor_enhancements/origins_ckeditor_enhancements.module
index ecd1045d..62b50141 100644
--- a/origins_ckeditor_enhancements/origins_ckeditor_enhancements.module
+++ b/origins_ckeditor_enhancements/origins_ckeditor_enhancements.module
@@ -5,8 +5,8 @@
  * Contains origins_ckeditor_enhancements.module.
  */
 
-use Drupal\ckeditor5\Plugin\CKEditor5PluginDefinition;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\ckeditor5\Plugin\CKEditor5PluginDefinition;
 
 /**
  * Implements hook_element_info_alter().
diff --git a/origins_common/origins_common.module b/origins_common/origins_common.module
index 10e3b4e6..0d8f7151 100644
--- a/origins_common/origins_common.module
+++ b/origins_common/origins_common.module
@@ -6,13 +6,14 @@
  */
 
 use Drupal\block\Entity\Block;
+use Drupal\node\Entity\Node;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\facets\FacetInterface;
-use Drupal\node\Entity\Node;
+
 
 /**
  * Implements hook_help().

From 082ba857ccd37288c5dc8e71d4aafd07e06f6ea8 Mon Sep 17 00:00:00 2001
From: DuttonMa <duttonma@gmail.com>
Date: Thu, 17 Oct 2024 14:14:34 +0100
Subject: [PATCH 4/4] Coding standards

---
 origins_common/origins_common.module                | 3 +--
 origins_media/src/Form/OriginsEntityEmbedDialog.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/origins_common/origins_common.module b/origins_common/origins_common.module
index 0d8f7151..781099e7 100644
--- a/origins_common/origins_common.module
+++ b/origins_common/origins_common.module
@@ -7,13 +7,12 @@
 
 use Drupal\block\Entity\Block;
 use Drupal\node\Entity\Node;
+use Drupal\facets\FacetInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
-use Drupal\facets\FacetInterface;
-
 
 /**
  * Implements hook_help().
diff --git a/origins_media/src/Form/OriginsEntityEmbedDialog.php b/origins_media/src/Form/OriginsEntityEmbedDialog.php
index dc82c9bd..378a5ead 100644
--- a/origins_media/src/Form/OriginsEntityEmbedDialog.php
+++ b/origins_media/src/Form/OriginsEntityEmbedDialog.php
@@ -24,7 +24,7 @@ public function getFormId() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, EditorInterface $editor = NULL, EmbedButtonInterface $embed_button = NULL) {
+  public function buildForm(array $form, FormStateInterface $form_state, ?EditorInterface $editor = NULL, ?EmbedButtonInterface $embed_button = NULL) {
     // Pass in our pre-set form_state into the origin entity embed form builder
     // so we can get the correct form output in the state we need it to be in
     // for location embeds (either new map or replace existing map).