Merge pull request #279 from Bixal/feature/BSD-278-update-deps

Feature/bsd 278 update deps

.lando.yml

@@ -1,6 +1,7 @@
 name: bixalcom
 config:
   via: 'nginx:1.25'
+  database: 'mariadb:10.6.18'
 services:
   appserver:
     overrides:

composer.log

@@ -33,3 +33,4 @@ d0b264b8bfd2f16b57808145e6c7b950|Matt Poole|feature/BSD-212-smpt-enable|Tue Jul
 4d4eeea0afa18c0874d2696e7ccf9b64|Matt Poole|feature/BSD-244-blog-images-marked-decorative|Wed Jul 31 14:45:51 EDT 2024|./composer.sh require drupal/media_library_edit:^3.0
 3257dd27ca54b3c2e8ec96a100874f2a|Matt Poole|feature/BSD-254-update-deps|Wed Jul 31 15:09:47 EDT 2024|./composer.sh update
 59d81fa4a3cb5b4021dd9824956e194c|Matt Poole|feature/BSD-271-validation-action|Tue Aug  6 13:13:48 EDT 2024|./composer.sh update mattsqd/robovalidate
+8a08b6d45145b305c16131bd11430688|Matt Poole|feature/BSD-278-update-deps|Thu Aug 15 12:05:25 EDT 2024|./composer.sh update

composer.patches.json

@@ -1,8 +1,5 @@
 {
   "patches": {
-    "drupal/admin_toolbar": {
-      "Search links always open new window / tab: https://www.drupal.org/project/admin_toolbar/issues/3420788": "https://www.drupal.org/files/issues/2024-02-29/search_links_always_open_new_window%20_tab.patch"
-    },
     "drupal/core-composer-scaffold": {
       "Disable drupal/core from scaffolding without being in composer.extra.drupal-scaffold.allowed-packages in that way one has more control of when new scaffolding is added.": "./patches/drupal.core-composer-scaffold.implicit-drupal-core-disable.patch"
     },

config/sync/core.entity_form_display.media.video.default.yml

@@ -1,4 +1,4 @@
-uuid: e562991c-4ce9-4810-9e5b-e29868af72b5
+uuid: 0c4a6f57-a2bf-455c-aadc-946f28a88851
 langcode: en
 status: true
 dependencies:

config/sync/core.entity_form_display.media.video.media_library.yml

@@ -1,4 +1,4 @@
-uuid: 34e759b6-d201-48c2-9154-7bbc8c6f8fbb
+uuid: 2cab22c6-8500-40be-9ca0-592e89feac20
 langcode: en
 status: true
 dependencies:

config/sync/core.entity_view_display.media.video.default.yml

@@ -1,4 +1,4 @@
-uuid: 365a0955-d13c-4c21-a1a4-def27329ceb5
+uuid: 09ac8185-142f-4dce-a785-594744fe3924
 langcode: en
 status: true
 dependencies:

config/sync/core.entity_view_display.media.video.media_library.yml

@@ -1,4 +1,4 @@
-uuid: 35d5a8bc-3c52-43fb-ac67-9c1c4f7c682c
+uuid: b013637f-eae2-4e6f-bb51-4714ce41226c
 langcode: en
 status: true
 dependencies:

config/sync/field.field.media.video.field_media_video_file.yml

@@ -1,4 +1,4 @@
-uuid: 72d94405-25fb-4bfe-8b15-40afb7e1e2e0
+uuid: 7729e79f-a50e-4107-b3a5-e327a6af2af5
 langcode: en
 status: true
 dependencies:

config/sync/field.storage.media.field_media_video_file.yml

@@ -1,4 +1,4 @@
-uuid: 8b541ad9-9849-483c-a6d8-1af671531165
+uuid: d34c39d4-3399-40e9-a225-c934a4de4541
 langcode: en
 status: true
 dependencies:

config/sync/language.content_settings.media.video.yml

@@ -1,4 +1,4 @@
-uuid: 1263755f-48c5-4e54-b54c-1d2c17050389
+uuid: c75e3c87-a9e0-4a41-9a4d-b9689b1d4e80
 langcode: en
 status: true
 dependencies:

config/sync/media.type.video.yml

@@ -1,4 +1,4 @@
-uuid: c44390ee-43fa-485a-86c8-6be189d84151
+uuid: 6484bbe4-3ee8-4ea3-a015-4a0be718e2fb
 langcode: en
 status: true
 dependencies: {  }

web/modules/custom/bixal_captcha/bixal_captcha.module

@@ -26,7 +26,7 @@ function bixal_captcha_captcha_alter(&$captcha, $info) {
  * Allows stopping contact form submissions from being sent by mail.
  */
 function bixal_captcha_mail_alter(&$message) {
-  if (!($message['params']['contact_message'] instanceof MessageInterface)) {
+  if (!isset($message['params']['contact_message']) || !($message['params']['contact_message'] instanceof MessageInterface)) {
     return;
   }
   /** @var \Drupal\contact\MessageInterface $contact_message */

web/modules/custom/case_studies/case_studies.install

@@ -21,8 +21,6 @@ function case_studies_update_8001() {
 
 /**
  * Add XML sitemap entries.
- *
- * @return void
  */
 function _case_studies_add_case_study_xmlsitemap_entries() {
   /** @var \Drupal\xmlsitemap\XmlSitemapLinkStorage $link_storage */

web/sites/default/settings.lando.php

@@ -47,22 +47,22 @@
 if (isset($lando_info->cache->type)) {
   switch ($lando_info->cache->type) {
     case 'redis':
-      require 'settings.redis.php';
-      if (function_exists('_settings_redis')) {
-        _settings_redis(
-          $settings,
-          $lando_info->cache->internal_connection->host,
-          $lando_info->cache->internal_connection->port
-        );
+      if (!function_exists('_settings_redis')) {
+        require 'settings.redis.php';
       }
+      _settings_redis(
+        $settings,
+        $lando_info->cache->internal_connection->host,
+        $lando_info->cache->internal_connection->port
+      );
       break;
 
     case 'memcached':
-      require 'settings.memcache.php';
-      if (function_exists('_settings_memcache')) {
-        $memcache_host = implode(':', (array)$lando_info->cache->internal_connection);
-        _settings_memcache($settings, $memcache_host);
+      if (!function_exists('_settings_memcache')) {
+        require 'settings.memcache.php';
       }
+      $memcache_host = implode(':', (array)$lando_info->cache->internal_connection);
+      _settings_memcache($settings, $memcache_host);
       break;
 
     default: