Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/composer/phpunit/phpunit-9.6.16
Browse files Browse the repository at this point in the history
  • Loading branch information
@edmund-dunn
edmund-dunn authored Jan 24, 2024
2 parents 45c1f36 + 3a59e67 commit f3ceb98
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 31 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
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.3425",
"va-gov/content-build": "^0.0.3426",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down
56 changes: 28 additions & 28 deletions composer.lock
View file
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": "57c2908d2309e44f8a31050b6b3aac55",
"content-hash": "26605fda111f4e1307b6d375ffc3e4b8",
"packages": [
{
"name": "asm89/stack-cors",
Expand Down Expand Up @@ -6572,17 +6572,17 @@
},
{
"name": "drupal/geocoder",
"version": "4.18.0",
"version": "4.19.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/geocoder.git",
"reference": "8.x-4.18"
"reference": "8.x-4.19"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.18.zip",
"reference": "8.x-4.18",
"shasum": "5ad95a5e6eceecdd32ebb42b3dc5b35487dfda7b"
"url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.19.zip",
"reference": "8.x-4.19",
"shasum": "ff8b5ff0eed16c11cb721471a70339ad325db5a2"
},
"require": {
"davedevelopment/stiphle": "^0.9.2",
Expand Down Expand Up @@ -6627,8 +6627,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-4.18",
"datestamp": "1703166690",
"version": "8.x-4.19",
"datestamp": "1706037829",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -15687,16 +15687,16 @@
},
{
"name": "laminas/laminas-stdlib",
"version": "3.18.0",
"version": "3.19.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-stdlib.git",
"reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf"
"reference": "6a192dd0882b514e45506f533b833b623b78fff3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf",
"reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf",
"url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/6a192dd0882b514e45506f533b833b623b78fff3",
"reference": "6a192dd0882b514e45506f533b833b623b78fff3",
"shasum": ""
},
"require": {
Expand All @@ -15707,10 +15707,10 @@
},
"require-dev": {
"laminas/laminas-coding-standard": "^2.5",
"phpbench/phpbench": "^1.2.14",
"phpunit/phpunit": "^10.3.3",
"phpbench/phpbench": "^1.2.15",
"phpunit/phpunit": "^10.5.8",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.15.0"
"vimeo/psalm": "^5.20.0"
},
"type": "library",
"autoload": {
Expand Down Expand Up @@ -15742,7 +15742,7 @@
"type": "community_bridge"
}
],
"time": "2023-09-19T10:15:21+00:00"
"time": "2024-01-19T12:39:49+00:00"
},
{
"name": "laminas/laminas-text",
Expand Down Expand Up @@ -18312,16 +18312,16 @@
},
{
"name": "php-http/promise",
"version": "1.2.1",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/promise.git",
"reference": "44a67cb59f708f826f3bec35f22030b3edb90119"
"reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/promise/zipball/44a67cb59f708f826f3bec35f22030b3edb90119",
"reference": "44a67cb59f708f826f3bec35f22030b3edb90119",
"url": "https://api.github.com/repos/php-http/promise/zipball/2916a606d3b390f4e9e8e2b8dd68581508be0f07",
"reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -18358,9 +18358,9 @@
],
"support": {
"issues": "https://github.com/php-http/promise/issues",
"source": "https://github.com/php-http/promise/tree/1.2.1"
"source": "https://github.com/php-http/promise/tree/1.3.0"
},
"time": "2023-11-08T12:57:08+00:00"
"time": "2024-01-04T18:49:48+00:00"
},
{
"name": "phpdocumentor/reflection-common",
Expand Down Expand Up @@ -25862,16 +25862,16 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3425",
"version": "v0.0.3426",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
"reference": "6c82218da1661c090d2883b26f40cf18e173ff98"
"reference": "c2ca35a8d4ac657b53b3f1b69eadb185eda1147a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/6c82218da1661c090d2883b26f40cf18e173ff98",
"reference": "6c82218da1661c090d2883b26f40cf18e173ff98",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/c2ca35a8d4ac657b53b3f1b69eadb185eda1147a",
"reference": "c2ca35a8d4ac657b53b3f1b69eadb185eda1147a",
"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.3425"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3426"
},
"time": "2024-01-17T18:59:30+00:00"
"time": "2024-01-23T17:57:20+00:00"
},
{
"name": "vlucas/phpdotenv",
Expand Down
2 changes: 1 addition & 1 deletion config/sync/next.settings.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ site_previewer_configuration:
sync_route_skip_routes: ''
preview_url_generator: simple_oauth
preview_url_generator_configuration:
secret_expiration: 300
secret_expiration: 86400
debug: false
6 changes: 5 additions & 1 deletion docroot/modules/custom/va_gov_menu_access/src/Service/MenuReductionService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,11 @@ protected function applyVamcMenuRulesForDetailPage(array &$form) {

$menu_element_type = $this->getMenuItemType($alias);
$menu_element_type = $menu_element_type ?? $this->checkForSeparator($allowed_separators, $menu_item);

if (str_contains($subject_uuid['option'], 'Work with us')) {
// This is a special case where we want to allow the menu item
// to be enabled.
$menu_element_type = self::ENABLED;
}
$this->addAllowedParent($allowed_parents, $enabled_count, $menu_element_type, $subject_uuid);
}
}
Expand Down

0 comments on commit f3ceb98

Please sign in to comment.