Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/composer/phpstan/phpstan-1.10.57
Browse files Browse the repository at this point in the history
  • Loading branch information
edmund-dunn authored Jan 25, 2024
2 parents 11418cd + d5e8a04 commit b74682f
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 35 deletions.
7 changes: 3 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"drupal/hierarchy_manager": "^3.0",
"drupal/hms_field": "^2.0",
"drupal/hook_event_dispatcher": "^4.0@beta",
"drupal/ief_table_view_mode": "^2.1",
"drupal/ief_table_view_mode": "^3.0",
"drupal/image_style_warmer": "^1.2@RC",
"drupal/image_widget_crop": "^2.2",
"drupal/jsonapi_extras": "^3.19",
Expand Down Expand Up @@ -222,7 +222,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^6.3",
"symfony/routing": "^6.3",
"va-gov/content-build": "^0.0.3426",
"va-gov/content-build": "^0.0.3427",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down Expand Up @@ -447,8 +447,7 @@
},
"drupal/inline_entity_form": {
"3226473 - Opt-in system delete.": "https://www.drupal.org/files/issues/2023-03-28/3226473-opt-in-system-delete-2.patch",
"3061620 - Cancel closes all forms": "https://www.drupal.org/files/issues/2022-07-21/inline_entity_form-close-only-forms-where-close-clicked-3061620-13.patch",
"3311501 - Add label to weight select field for accessibility": "https://www.drupal.org/files/issues/2022-09-23/Adding_labels_to_weight_selects_for_accessibility.patch"
"3061620 - Cancel closes all forms": "https://www.drupal.org/files/issues/2022-07-21/inline_entity_form-close-only-forms-where-close-clicked-3061620-13.patch"
},
"drupal/jsonapi_menu_items": {
"3276561 - Add support for the Menu Item Extras module": "https://www.drupal.org/files/issues/2022-08-01/3276561-05-menu_item_extras_support.patch"
Expand Down
62 changes: 31 additions & 31 deletions composer.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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": "26605fda111f4e1307b6d375ffc3e4b8",
"content-hash": "26320bc610a7b624865efbbf2f06c0b2",
"packages": [
{
"name": "asm89/stack-cors",
Expand Down Expand Up @@ -122,7 +122,7 @@
"version": "v4.1.0",
"source": {
"type": "git",
"url": "https://github.com/fengyuanchen/cropper.git",
"url": "git@github.com:fengyuanchen/cropper.git",
"reference": "617d9bdb8688cc4edb3b03bc49a04b83c7facbe7"
},
"dist": {
Expand Down Expand Up @@ -6572,17 +6572,17 @@
},
{
"name": "drupal/geocoder",
"version": "4.19.0",
"version": "4.20.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/geocoder.git",
"reference": "8.x-4.19"
"reference": "8.x-4.20"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.19.zip",
"reference": "8.x-4.19",
"shasum": "ff8b5ff0eed16c11cb721471a70339ad325db5a2"
"url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.20.zip",
"reference": "8.x-4.20",
"shasum": "1bf5ff7082e64f55128032b61c7333fd611c5347"
},
"require": {
"davedevelopment/stiphle": "^0.9.2",
Expand Down Expand Up @@ -6627,8 +6627,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-4.19",
"datestamp": "1706037829",
"version": "8.x-4.20",
"datestamp": "1706097387",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -7356,27 +7356,27 @@
},
{
"name": "drupal/ief_table_view_mode",
"version": "2.3.0",
"version": "3.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/ief_table_view_mode.git",
"reference": "8.x-2.3"
"reference": "3.0.0"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/ief_table_view_mode-8.x-2.3.zip",
"reference": "8.x-2.3",
"shasum": "8f5f2d38745a7654ce72b311f0333478fa7f2aeb"
"url": "https://ftp.drupal.org/files/projects/ief_table_view_mode-3.0.0.zip",
"reference": "3.0.0",
"shasum": "4a434bbe8ccebffa6dd3efcd818bfd5667b6f571"
},
"require": {
"drupal/core": "^8.7.7 || ^9 || ^10",
"drupal/inline_entity_form": "^1.0"
"drupal/core": "^9 || ^10",
"drupal/inline_entity_form": "^1.0 || ^2.0 || ^3.0"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-2.3",
"datestamp": "1671410068",
"version": "3.0.0",
"datestamp": "1705614692",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -7531,17 +7531,17 @@
},
{
"name": "drupal/inline_entity_form",
"version": "1.0.0-rc17",
"version": "3.0.0-rc19",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/inline_entity_form.git",
"reference": "8.x-1.0-rc17"
"reference": "3.0.0-rc19"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc17.zip",
"reference": "8.x-1.0-rc17",
"shasum": "626622e01cf7a2d2977fdc06ae09afd5a814e09b"
"url": "https://ftp.drupal.org/files/projects/inline_entity_form-3.0.0-rc19.zip",
"reference": "3.0.0-rc19",
"shasum": "d8976940dd3f85412ba5e274af15fbcdd22ee27a"
},
"require": {
"drupal/core": "^8.8 || ^9 || ^10",
Expand All @@ -7553,8 +7553,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.0-rc17",
"datestamp": "1703020130",
"version": "3.0.0-rc19",
"datestamp": "1704729077",
"security-coverage": {
"status": "not-covered",
"message": "RC releases are not covered by Drupal security advisories."
Expand Down Expand Up @@ -25862,16 +25862,16 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3426",
"version": "v0.0.3427",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
"reference": "c2ca35a8d4ac657b53b3f1b69eadb185eda1147a"
"reference": "d98e082265882b311383cb6a0b83ef6cf6d72f42"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/c2ca35a8d4ac657b53b3f1b69eadb185eda1147a",
"reference": "c2ca35a8d4ac657b53b3f1b69eadb185eda1147a",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/d98e082265882b311383cb6a0b83ef6cf6d72f42",
"reference": "d98e082265882b311383cb6a0b83ef6cf6d72f42",
"shasum": ""
},
"type": "node-project",
Expand All @@ -25898,9 +25898,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.3426"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3427"
},
"time": "2024-01-23T17:57:20+00:00"
"time": "2024-01-24T17:14:58+00:00"
},
{
"name": "vlucas/phpdotenv",
Expand Down

0 comments on commit b74682f

Please sign in to comment.