Merge branch 'main' into dependabot/composer/drupal/upgrade_status-4.1.0

department-of-veterans-affairs · Mar 4, 2024 · e11880b · e11880b
2 parents e152f42 + acfa2a5
commit e11880b
Show file tree

Hide file tree

Showing 35 changed files with 1,589 additions and 271 deletions.
diff --git a/...am-and-sitewide-crew-member-onboarding.md → ...UE_TEMPLATE/cms-team-member-onboarding.md b/...am-and-sitewide-crew-member-onboarding.md → ...UE_TEMPLATE/cms-team-member-onboarding.md
diff --git a/.github/ISSUE_TEMPLATE/sitewide-crew-member-onboarding.md b/.github/ISSUE_TEMPLATE/sitewide-crew-member-onboarding.md
diff --git a/composer.json b/composer.json
@@ -134,7 +134,7 @@
         "drupal/migrate_tools": "^6.0",
         "drupal/migration_tools": "^2.8",
         "drupal/mimemail": "^1.0@alpha",
-        "drupal/monolog": "^3.0",
+        "drupal/monolog": "^2.0",
         "drupal/next": "^1.1",
         "drupal/no_table_drag": "^2.0@alpha",
         "drupal/node_link_report": "^1.14",
@@ -223,7 +223,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3445",
+        "va-gov/content-build": "^0.0.3446",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",

diff --git a/composer.lock b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5c3df526618a70dfaeeafe7671a6e6f8",
+    "content-hash": "5519bf62017d8599ccdfed6913db3979",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -3038,6 +3038,10 @@
                 {
                     "name": "boromino",
                     "homepage": "https://www.drupal.org/user/859722"
+                },
+                {
+                    "name": "mparker17",
+                    "homepage": "https://www.drupal.org/user/536298"
                 }
             ],
             "description": "Adds CKEditor abbreviation button.",
@@ -9488,8 +9492,8 @@
                     "version": "1.0.1",
                     "datestamp": "1696824307",
                     "security-coverage": {
-                        "status": "not-covered",
-                        "message": "Project has not opted into security advisory coverage!"
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
                     }
                 }
             },
@@ -10188,36 +10192,28 @@
         },
         {
             "name": "drupal/monolog",
-            "version": "3.0.2",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/monolog.git",
-                "reference": "3.0.2"
+                "reference": "2.2.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/monolog-3.0.2.zip",
-                "reference": "3.0.2",
-                "shasum": "a88e8249028e56a21c4472891381412b9733f768"
+                "url": "https://ftp.drupal.org/files/projects/monolog-2.2.0.zip",
+                "reference": "2.2.0",
+                "shasum": "3f243ccfb19cb30c75637882e24b1d8acfdb2f9a"
             },
             "require": {
-                "drupal/core": "^10",
-                "monolog/monolog": "^3.2.0",
-                "php": "^8.1.0"
-            },
-            "require-dev": {
-                "mglaman/phpstan-drupal": "^1.1",
-                "phpstan/extension-installer": "^1.3",
-                "phpstan/phpstan": "^1.11",
-                "phpstan/phpstan-deprecation-rules": "*",
-                "phpstan/phpstan-strict-rules": "^1.5",
-                "previousnext/coding-standard": "^1.0"
+                "drupal/core": "^8.8 || ^9 || ^10",
+                "monolog/monolog": "^2.8.0",
+                "php": "^7.4|^8"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "3.0.2",
-                    "datestamp": "1707845433",
+                    "version": "2.2.0",
+                    "datestamp": "1662121628",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -10235,14 +10231,14 @@
             ],
             "authors": [
                 {
-                    "name": "Luca Lusso",
+                    "name": "Chris Pliakas",
                     "homepage": "https://www.drupal.org/user/266779",
-                    "email": "lussoluca@gmail.com",
+                    "email": "opensource@chrispliakas.com",
                     "role": "Project Lead"
                 },
                 {
                     "name": "See contributors",
-                    "homepage": "https://drupal.org/node/1937716/committers",
+                    "homepage": "http://drupal.org/node/1937716/committers",
                     "role": "Developer"
                 },
                 {
@@ -10251,10 +10247,10 @@
                 }
             ],
             "description": "A Framework for integrating with the Monolog library.",
-            "homepage": "https://drupal.org/project/monolog",
+            "homepage": "http://drupal.org/project/monolog",
             "support": {
                 "source": "https://git.drupalcode.org/project/monolog",
-                "issues": "https://drupal.org/project/issues/monolog"
+                "issues": "http://drupal.org/project/issues/monolog"
             }
         },
         {
@@ -16890,41 +16886,42 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.5.0",
+            "version": "2.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448"
+                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448",
-                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
+                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "psr/log": "^2.0 || ^3.0"
+                "php": ">=7.2",
+                "psr/log": "^1.0.1 || ^2.0 || ^3.0"
             },
             "provide": {
-                "psr/log-implementation": "3.0.0"
+                "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "^3.0",
+                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
                 "doctrine/couchdb": "~1.0@dev",
                 "elasticsearch/elasticsearch": "^7 || ^8",
                 "ext-json": "*",
-                "graylog2/gelf-php": "^1.4.2 || ^2.0",
-                "guzzlehttp/guzzle": "^7.4.5",
+                "graylog2/gelf-php": "^1.4.2 || ^2@dev",
+                "guzzlehttp/guzzle": "^7.4",
                 "guzzlehttp/psr7": "^2.2",
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "phpstan/phpstan": "^1.9",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.4",
-                "phpunit/phpunit": "^10.1",
-                "predis/predis": "^1.1 || ^2",
+                "phpspec/prophecy": "^1.15",
+                "phpstan/phpstan": "^0.12.91",
+                "phpunit/phpunit": "^8.5.14",
+                "predis/predis": "^1.1 || ^2.0",
+                "rollbar/rollbar": "^1.3 || ^2 || ^3",
                 "ruflin/elastica": "^7",
+                "swiftmailer/swiftmailer": "^5.3|^6.0",
                 "symfony/mailer": "^5.4 || ^6",
                 "symfony/mime": "^5.4 || ^6"
             },
@@ -16947,7 +16944,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.x-dev"
+                    "dev-main": "2.x-dev"
                 }
             },
             "autoload": {
@@ -16975,7 +16972,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.5.0"
+                "source": "https://github.com/Seldaek/monolog/tree/2.9.2"
             },
             "funding": [
                 {
@@ -16987,7 +16984,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-27T15:32:31+00:00"
+            "time": "2023-10-27T15:25:26+00:00"
         },
         {
             "name": "mtownsend/xml-to-array",
@@ -18517,16 +18514,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.8.1",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353"
+                "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353",
-                "reference": "bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc",
+                "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc",
                 "shasum": ""
             },
             "require": {
@@ -18569,9 +18566,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.1"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0"
             },
-            "time": "2024-01-18T19:15:27+00:00"
+            "time": "2024-01-11T11:49:22+00:00"
         },
         {
             "name": "phpmailer/phpmailer",
@@ -25896,16 +25893,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3445",
+            "version": "v0.0.3446",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "f766b8fa1a295043a63d922494730ddac82017d0"
+                "reference": "9698bdedde07f95985f540b4f5d886240c2910ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/f766b8fa1a295043a63d922494730ddac82017d0",
-                "reference": "f766b8fa1a295043a63d922494730ddac82017d0",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/9698bdedde07f95985f540b4f5d886240c2910ee",
+                "reference": "9698bdedde07f95985f540b4f5d886240c2910ee",
                 "shasum": ""
             },
             "type": "node-project",
@@ -25932,9 +25929,9 @@
             "description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
             "support": {
                 "issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
-                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3445"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3446"
             },
-            "time": "2024-02-21T17:40:10+00:00"
+            "time": "2024-02-23T21:52:21+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

diff --git a/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml b/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml
@@ -15,7 +15,6 @@ dependencies:
     - field.field.node.health_care_local_facility.field_location_services
     - field.field.node.health_care_local_facility.field_main_location
     - field.field.node.health_care_local_facility.field_media
-    - field.field.node.health_care_local_facility.field_mental_health_contact_phon
     - field.field.node.health_care_local_facility.field_mental_health_phone
     - field.field.node.health_care_local_facility.field_meta_tags
     - field.field.node.health_care_local_facility.field_mobile
@@ -93,7 +92,7 @@ third_party_settings:
       label: 'VAMC system'
       region: content
       parent_name: ''
-      weight: 2
+      weight: 3
       format_type: fieldset
       format_settings:
         classes: ''
@@ -107,7 +106,7 @@ third_party_settings:
       label: 'Title and summary'
       region: content
       parent_name: ''
-      weight: 3
+      weight: 4
       format_type: fieldset
       format_settings:
         classes: ''
@@ -133,7 +132,7 @@ third_party_settings:
       label: 'Operating status'
       region: content
       parent_name: ''
-      weight: 1
+      weight: 2
       format_type: fieldset
       format_settings:
         classes: ''
@@ -148,7 +147,7 @@ third_party_settings:
       label: 'Meta Tags'
       region: content
       parent_name: ''
-      weight: 4
+      weight: 5
       format_type: fieldset
       format_settings:
         classes: ''
@@ -158,7 +157,6 @@ third_party_settings:
     group_locations_and_contact_info:
       children:
         - group_facility_data_from_vast
-        - field_mental_health_contact_phon
       label: 'Locations and contact information'
       region: content
       parent_name: ''
@@ -179,7 +177,6 @@ third_party_settings:
         - field_geolocation
         - field_mobile
         - field_phone_number
-        - field_mental_health_phone
         - field_office_hours
         - field_timezone
       label: 'Facility data'
@@ -318,16 +315,9 @@ content:
     settings:
       media_types: {  }
     third_party_settings: {  }
-  field_mental_health_contact_phon:
-    type: telephone_default
-    weight: 21
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
   field_mental_health_phone:
     type: telephone_default
-    weight: 28
+    weight: 1
     region: content
     settings:
       placeholder: ''

diff --git a/config/sync/core.entity_form_display.node.health_care_local_facility.inline_entity_form.yml b/config/sync/core.entity_form_display.node.health_care_local_facility.inline_entity_form.yml
@@ -16,7 +16,6 @@ dependencies:
     - field.field.node.health_care_local_facility.field_location_services
     - field.field.node.health_care_local_facility.field_main_location
     - field.field.node.health_care_local_facility.field_media
-    - field.field.node.health_care_local_facility.field_mental_health_contact_phon
     - field.field.node.health_care_local_facility.field_mental_health_phone
     - field.field.node.health_care_local_facility.field_meta_tags
     - field.field.node.health_care_local_facility.field_mobile
@@ -151,7 +150,6 @@ hidden:
   field_location_services: true
   field_main_location: true
   field_media: true
-  field_mental_health_contact_phon: true
   field_mental_health_phone: true
   field_meta_tags: true
   field_mobile: true

diff --git a/config/sync/core.entity_form_display.node.person_profile.default.yml b/config/sync/core.entity_form_display.node.person_profile.default.yml
@@ -194,7 +194,7 @@ content:
       counter_position: after
       js_prevent_submit: false
       count_html_characters: false
-      textcount_status_message: '@remaining_count characters remaining'
+      textcount_status_message: '<span class="remaining_count">@remaining_count</span> characters remaining'
     third_party_settings: {  }
   field_last_name:
     type: string_textfield