From 7cb58445671263f4f81600a99b60d3d6a9381dfe Mon Sep 17 00:00:00 2001 From: Christian Burk <766573+omahane@users.noreply.github.com> Date: Wed, 20 Nov 2024 13:15:05 -0600 Subject: [PATCH 1/4] VACMS-19921: Updates content build version (#19922) --- composer.json | 2 +- composer.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index f95082e9ab..753d905f66 100644 --- a/composer.json +++ b/composer.json @@ -231,7 +231,7 @@ "symfony/phpunit-bridge": "^5.1", "symfony/process": "^6.3", "symfony/routing": "^6.3", - "va-gov/content-build": "^0.0.3634", + "va-gov/content-build": "^0.0.3636", "vlucas/phpdotenv": "^5.6", "webflo/drupal-finder": "1.3.1", "webmozart/path-util": "^2.3", diff --git a/composer.lock b/composer.lock index d10361d154..e2b7557f92 100644 --- 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": "ec44d38f6316eb88b8afe9f0c1666cca", + "content-hash": "fca779b2cf4c9d2fcc08419830747620", "packages": [ { "name": "asm89/stack-cors", @@ -26850,16 +26850,16 @@ }, { "name": "va-gov/content-build", - "version": "v0.0.3634", + "version": "v0.0.3636", "source": { "type": "git", "url": "https://github.com/department-of-veterans-affairs/content-build.git", - "reference": "e7b05fc40684b98122caa4f3a3bb04a17b89e466" + "reference": "daa51fda315eb924752c6532ede43563b83b8c49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/e7b05fc40684b98122caa4f3a3bb04a17b89e466", - "reference": "e7b05fc40684b98122caa4f3a3bb04a17b89e466", + "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/daa51fda315eb924752c6532ede43563b83b8c49", + "reference": "daa51fda315eb924752c6532ede43563b83b8c49", "shasum": "" }, "type": "node-project", @@ -26886,9 +26886,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.3634" + "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3636" }, - "time": "2024-11-07T22:32:40+00:00" + "time": "2024-11-20T05:24:12+00:00" }, { "name": "vlucas/phpdotenv", @@ -27895,6 +27895,7 @@ "drupal/fieldhelptext": 10, "drupal/flag": 10, "drupal/graphql_menu": 15, + "drupal/html_tag_usage": 10, "drupal/image_style_warmer": 5, "drupal/jsonapi_resources": 10, "drupal/limited_field_widgets": 15, @@ -27914,13 +27915,12 @@ "drupal/simplesamlphp_auth": 5, "drupal/styleguide": 10, "drupal/user_history": 15, - "drupal/viewfield": 10, - "drupal/html_tag_usage": 10 + "drupal/viewfield": 10 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "platform-overrides": { "php": "8.1" }, From da0d4abd03579873f61303a6b7b7e28402a3659c Mon Sep 17 00:00:00 2001 From: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Date: Thu, 21 Nov 2024 14:13:33 -0800 Subject: [PATCH 2/4] VACMS-19938: updating drupal core to v10.3.9 (#19939) --- composer.lock | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/composer.lock b/composer.lock index e2b7557f92..6b13b97fe3 100644 --- a/composer.lock +++ b/composer.lock @@ -4122,16 +4122,16 @@ }, { "name": "drupal/core", - "version": "10.3.8", + "version": "10.3.9", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "4006024a8dd7c9976fad0a2af7c9034d120c8e44" + "reference": "42a6516491b4793158542a2326dc6ad1fe2aa5bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/4006024a8dd7c9976fad0a2af7c9034d120c8e44", - "reference": "4006024a8dd7c9976fad0a2af7c9034d120c8e44", + "url": "https://api.github.com/repos/drupal/core/zipball/42a6516491b4793158542a2326dc6ad1fe2aa5bd", + "reference": "42a6516491b4793158542a2326dc6ad1fe2aa5bd", "shasum": "" }, "require": { @@ -4280,13 +4280,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.3.8" + "source": "https://github.com/drupal/core/tree/10.3.9" }, - "time": "2024-11-12T09:52:10+00:00" + "time": "2024-11-20T17:59:45+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.8", + "version": "10.3.9", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -4330,22 +4330,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.8" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.9" }, "time": "2024-08-22T14:31:34+00:00" }, { "name": "drupal/core-recommended", - "version": "10.3.8", + "version": "10.3.9", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "d43bb57a01bfdd624c423ec4ba3e1c45b90be1fa" + "reference": "03da2860a10c12b86714e778178433b620bb890d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/d43bb57a01bfdd624c423ec4ba3e1c45b90be1fa", - "reference": "d43bb57a01bfdd624c423ec4ba3e1c45b90be1fa", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/03da2860a10c12b86714e778178433b620bb890d", + "reference": "03da2860a10c12b86714e778178433b620bb890d", "shasum": "" }, "require": { @@ -4354,7 +4354,7 @@ "doctrine/annotations": "~1.14.3", "doctrine/deprecations": "~1.1.3", "doctrine/lexer": "~2.1.1", - "drupal/core": "10.3.8", + "drupal/core": "10.3.9", "egulias/email-validator": "~4.0.2", "guzzlehttp/guzzle": "~7.8.1", "guzzlehttp/promises": "~2.0.2", @@ -4415,9 +4415,9 @@ ], "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/10.3.8" + "source": "https://github.com/drupal/core-recommended/tree/10.3.9" }, - "time": "2024-11-12T09:52:10+00:00" + "time": "2024-11-20T17:59:45+00:00" }, { "name": "drupal/core_event_dispatcher", @@ -19711,26 +19711,27 @@ }, { "name": "phpspec/prophecy", - "version": "v1.19.0", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87" + "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/67a759e7d8746d501c41536ba40cd9c0a07d6a87", - "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/a0165c648cab6a80311c74ffc708a07bb53ecc93", + "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^3.40", "phpspec/phpspec": "^6.0 || ^7.0", "phpstan/phpstan": "^1.9", "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" @@ -19774,9 +19775,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.19.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.20.0" }, - "time": "2024-02-29T11:52:51+00:00" + "time": "2024-11-19T13:12:41+00:00" }, { "name": "phpspec/prophecy-phpunit", From 657a9336cde347435e725a4f738ffd17a44d7d49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 18:33:39 -0800 Subject: [PATCH 3/4] Bump va-gov/content-build from 0.0.3636 to 0.0.3637 (#19941) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3636 to 0.0.3637. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3636...v0.0.3637) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 753d905f66..2a2d7580cb 100644 --- a/composer.json +++ b/composer.json @@ -231,7 +231,7 @@ "symfony/phpunit-bridge": "^5.1", "symfony/process": "^6.3", "symfony/routing": "^6.3", - "va-gov/content-build": "^0.0.3636", + "va-gov/content-build": "^0.0.3637", "vlucas/phpdotenv": "^5.6", "webflo/drupal-finder": "1.3.1", "webmozart/path-util": "^2.3", diff --git a/composer.lock b/composer.lock index 6b13b97fe3..1ac42bc6db 100644 --- 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": "fca779b2cf4c9d2fcc08419830747620", + "content-hash": "a69f035d0ff7de8659a38f13f7c2d647", "packages": [ { "name": "asm89/stack-cors", @@ -26851,16 +26851,16 @@ }, { "name": "va-gov/content-build", - "version": "v0.0.3636", + "version": "v0.0.3637", "source": { "type": "git", "url": "https://github.com/department-of-veterans-affairs/content-build.git", - "reference": "daa51fda315eb924752c6532ede43563b83b8c49" + "reference": "12c93c10c5d25295977dc7b89f4741b50ff8780a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/daa51fda315eb924752c6532ede43563b83b8c49", - "reference": "daa51fda315eb924752c6532ede43563b83b8c49", + "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/12c93c10c5d25295977dc7b89f4741b50ff8780a", + "reference": "12c93c10c5d25295977dc7b89f4741b50ff8780a", "shasum": "" }, "type": "node-project", @@ -26887,9 +26887,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.3636" + "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3637" }, - "time": "2024-11-20T05:24:12+00:00" + "time": "2024-11-20T19:19:21+00:00" }, { "name": "vlucas/phpdotenv", @@ -27896,7 +27896,6 @@ "drupal/fieldhelptext": 10, "drupal/flag": 10, "drupal/graphql_menu": 15, - "drupal/html_tag_usage": 10, "drupal/image_style_warmer": 5, "drupal/jsonapi_resources": 10, "drupal/limited_field_widgets": 15, @@ -27916,12 +27915,13 @@ "drupal/simplesamlphp_auth": 5, "drupal/styleguide": 10, "drupal/user_history": 15, - "drupal/viewfield": 10 + "drupal/viewfield": 10, + "drupal/html_tag_usage": 10 }, "prefer-stable": true, "prefer-lowest": false, - "platform": {}, - "platform-dev": {}, + "platform": [], + "platform-dev": [], "platform-overrides": { "php": "8.1" }, From b3a507143a81e7b4e3a0a3f61b122cbfa2c93a8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 18:51:28 -0800 Subject: [PATCH 4/4] Bump va-gov/content-build from 0.0.3637 to 0.0.3639 (#19966) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3637 to 0.0.3639. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3637...v0.0.3639) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 2a2d7580cb..351c3f8e78 100644 --- a/composer.json +++ b/composer.json @@ -231,7 +231,7 @@ "symfony/phpunit-bridge": "^5.1", "symfony/process": "^6.3", "symfony/routing": "^6.3", - "va-gov/content-build": "^0.0.3637", + "va-gov/content-build": "^0.0.3639", "vlucas/phpdotenv": "^5.6", "webflo/drupal-finder": "1.3.1", "webmozart/path-util": "^2.3", diff --git a/composer.lock b/composer.lock index 1ac42bc6db..a6f4f6f493 100644 --- 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": "a69f035d0ff7de8659a38f13f7c2d647", + "content-hash": "46d871748afd027c07d8e0eb6ab6038f", "packages": [ { "name": "asm89/stack-cors", @@ -26851,16 +26851,16 @@ }, { "name": "va-gov/content-build", - "version": "v0.0.3637", + "version": "v0.0.3639", "source": { "type": "git", "url": "https://github.com/department-of-veterans-affairs/content-build.git", - "reference": "12c93c10c5d25295977dc7b89f4741b50ff8780a" + "reference": "afb998923f8d593490e2d4ac739d115de453a52e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/12c93c10c5d25295977dc7b89f4741b50ff8780a", - "reference": "12c93c10c5d25295977dc7b89f4741b50ff8780a", + "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/afb998923f8d593490e2d4ac739d115de453a52e", + "reference": "afb998923f8d593490e2d4ac739d115de453a52e", "shasum": "" }, "type": "node-project", @@ -26887,9 +26887,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.3637" + "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3639" }, - "time": "2024-11-20T19:19:21+00:00" + "time": "2024-11-25T16:30:31+00:00" }, { "name": "vlucas/phpdotenv",