Merge branch 'main' into VACMS-18070-public_file_base_header_response

department-of-veterans-affairs · Jul 10, 2024 · ec8ec2b · ec8ec2b
2 parents 5190c35 + 4b78a60
commit ec8ec2b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/READMES/migrations-facility.md b/READMES/migrations-facility.md
@@ -12,8 +12,8 @@
 ```mermaid
   graph TD;
     vast[VAST, Access To Care, etc]-- 7:30AM -->fapi;
-    fapi[(Facility API)]-- 8:00AM -->migrations[CMS migrations];
-    fapi-- Vets API -->fl[[Facility Locator App]];
+    fapi[(LH Facility API)]-- 8:00AM -->migrations[CMS migrations];
+    fapi-- facilities-api in vets-api -->fl[[Facility Locator App]];
     migrations-->nodes[Nodes: VAMC, Vet Centers, VBA, NCA];
     nodes-->FE[[FE pages]];
     nodes-->data

diff --git a/composer.json b/composer.json
@@ -409,8 +409,8 @@
                 "3111456 - Unable to resolve path on node in other language than default": "https://www.drupal.org/files/issues/2022-12-01/decouple_router-3111456-resolve-language-issue-58--get-translation.patch"
             },
             "drupal/diff": {
-                "3228798 - Make revisions overview page accessible": "https://www.drupal.org/files/issues/2022-01-21/diff-a11y-3228798-15.patch",
-                "2834253 - Missing column headings in Revisions list": "https://www.drupal.org/files/issues/2021-08-19/diff-missing-column-headers-2834253-15.patch"
+                "3228798 - Make revisions overview page accessible": "https://www.drupal.org/files/issues/2024-05-14/diff-3228798-17.patch",
+                "2834253 - Missing column headings in Revisions list": "https://www.drupal.org/files/issues/2024-05-09/diff-missing_column_headers-2834253-23.patch"
             },
             "drupal/entity_browser": {
                 "2856138 - Entity browser cardinality validation": "https://www.drupal.org/files/issues/0001-Issue-2856138-by-gordon-Error-messages-are-not-being.patch",

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": "d4a8e6fee6064073a5f736e456c263c9",
+    "content-hash": "bc01a325471df223b116eb6cced175e2",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -4825,27 +4825,38 @@
         },
         {
             "name": "drupal/diff",
-            "version": "1.1.0",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/diff.git",
-                "reference": "8.x-1.1"
+                "reference": "8.x-1.7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/diff-8.x-1.1.zip",
-                "reference": "8.x-1.1",
-                "shasum": "b7558b0f431d5945289829946e0beba61bf7ae18"
+                "url": "https://ftp.drupal.org/files/projects/diff-8.x-1.7.zip",
+                "reference": "8.x-1.7",
+                "shasum": "d282bdf3350ac71f95b38576a9f397bdbab8d249"
             },
             "require": {
-                "drupal/core": "^9.3 || ^10",
-                "mkalkbrenner/php-htmldiff-advanced": "~0.0.8"
+                "drupal/core": "^10 || ^11",
+                "mkalkbrenner/php-htmldiff-advanced": "~0.0.8",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "jangregor/phpstan-prophecy": "dev-master",
+                "mglaman/phpstan-drupal": "^1.2.10",
+                "phpstan/extension-installer": "^1.2",
+                "phpstan/phpstan": "^1.11",
+                "phpstan/phpstan-deprecation-rules": "*",
+                "phpstan/phpstan-phpunit": "1.4.x-dev",
+                "phpstan/phpstan-strict-rules": "^1@stable",
+                "previousnext/coding-standard": "^1"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.1",
-                    "datestamp": "1665437355",
+                    "version": "8.x-1.7",
+                    "datestamp": "1718073570",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4882,6 +4893,11 @@
                     "homepage": "https://www.drupal.org/u/realityloop",
                     "role": "Maintainer"
                 },
+                {
+                    "name": "Adam Bramley (acbramley)",
+                    "homepage": "https://www.drupal.org/u/acbramley",
+                    "role": "Maintainer"
+                },
                 {
                     "name": "lhangea",
                     "homepage": "https://www.drupal.org/user/2743803"
@@ -4910,7 +4926,7 @@
             "description": "Compares two entity revisions",
             "homepage": "https://www.drupal.org/project/diff",
             "support": {
-                "source": "http://cgit.drupalcode.org/diff",
+                "source": "https://git.drupalcode.org/project/diff",
                 "issues": "https://www.drupal.org/project/issues/diff"
             }
         },