Skip to content

Commit

Permalink
Merge branch 'main' into VACMS-15714-va-police-page
Browse files Browse the repository at this point in the history
  • Loading branch information
@jilladams
jilladams authored Nov 27, 2023
2 parents 44ac56e + 8d58bd5 commit d3f7409
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 31 deletions.
10 changes: 8 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"composer/installers": "^2.2.0",
"consolidation/site-process": "^4.1",
"cweagans/composer-patches": "^1.7",
"datadog/dd-trace": "^0.93.1",
"datadog/dd-trace": "^0.94.0",
"dealerdirect/phpcodesniffer-composer-installer": "0.7.2",
"drupal/address": "^1.4",
"drupal/admin_feedback": "^2.2",
Expand Down Expand Up @@ -208,7 +208,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^4.0",
"symfony/routing": "^4.0",
"va-gov/content-build": "^0.0.3390",
"va-gov/content-build": "^0.0.3392",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down Expand Up @@ -533,6 +533,7 @@
"va:drush": "Run Drush transparently (all arguments will be passed).",
"va:npm": "Run NPM transparently (all arguments will be passed).",
"va:nuke": "Remove all Composer package and cache directories.",
"va:phpcbf": "Run PHP Code Beautifier and Fixer transparently (all arguments will be passed).",
"va:remove-git-dirs": "Remove .git directories within this directory, e.g. those created by Composer.",
"va:set-path": "Display a command for updating the path to include `./bin`.",
"va:ds:drupal": "Build the Drupal theme.",
Expand Down Expand Up @@ -622,6 +623,11 @@
"! ./scripts/should-run-directly.sh || ./scripts/nuke-composer-directories.sh",
"./scripts/should-run-directly.sh || ddev composer va:nuke --"
],
"va:phpcbf": [
"# Run PHP Code Beautifier and Fixer transparently (all arguments will be passed).",
"! ./scripts/should-run-directly.sh || bin/phpcbf -p --",
"./scripts/should-run-directly.sh || ddev composer va:phpcbf --"
],
"va:proxy:socks": [
"# Set up a SOCKS proxy.",
"./scripts/connect-socks.sh"
Expand Down
70 changes: 41 additions & 29 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": "762cdcc61a6de38494a9855b7e656b96",
"content-hash": "d4021cb5119f043c65b6619b15d1df4a",
"packages": [
{
"name": "alchemy/zippy",
Expand Down Expand Up @@ -1271,16 +1271,16 @@
},
{
"name": "datadog/dd-trace",
"version": "0.93.2",
"version": "0.94.0",
"source": {
"type": "git",
"url": "https://github.com/DataDog/dd-trace-php.git",
"reference": "7850350e97f1bc26466ccaf72d0b41cf2ade4127"
"reference": "dc23b0c7f826fb832e8d69e350524de5a07002c2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/DataDog/dd-trace-php/zipball/7850350e97f1bc26466ccaf72d0b41cf2ade4127",
"reference": "7850350e97f1bc26466ccaf72d0b41cf2ade4127",
"url": "https://api.github.com/repos/DataDog/dd-trace-php/zipball/dc23b0c7f826fb832e8d69e350524de5a07002c2",
"reference": "dc23b0c7f826fb832e8d69e350524de5a07002c2",
"shasum": ""
},
"require": {
Expand All @@ -1299,6 +1299,16 @@
"type": "library",
"extra": {
"scenarios": {
"opentelemetry1": {
"require": {
"open-telemetry/sdk": "@stable",
"open-telemetry/extension-propagator-b3": "@stable",
"open-telemetry/opentelemetry-logger-monolog": "@stable"
},
"scenario-options": {
"create-lockfile": false
}
},
"opentracing_beta5": {
"require": {
"opentracing/opentracing": "1.0.0-beta5"
Expand Down Expand Up @@ -1359,9 +1369,9 @@
],
"support": {
"issues": "https://github.com/DataDog/dd-trace-php/issues",
"source": "https://github.com/DataDog/dd-trace-php/tree/0.93.2"
"source": "https://github.com/DataDog/dd-trace-php/tree/0.94.0"
},
"time": "2023-11-13T11:35:31+00:00"
"time": "2023-11-20T17:09:04+00:00"
},
{
"name": "davedevelopment/stiphle",
Expand Down Expand Up @@ -6438,17 +6448,17 @@
},
{
"name": "drupal/geocoder",
"version": "3.35.0",
"version": "3.36.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/geocoder.git",
"reference": "8.x-3.35"
"reference": "8.x-3.36"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/geocoder-8.x-3.35.zip",
"reference": "8.x-3.35",
"shasum": "3e63b48fedf4c720ec51f8c0d804bfbbbfc6829f"
"url": "https://ftp.drupal.org/files/projects/geocoder-8.x-3.36.zip",
"reference": "8.x-3.36",
"shasum": "77494b78d55c5a2906619c9e125bae7a842c40ca"
},
"require": {
"davedevelopment/stiphle": "^0.9.2",
Expand All @@ -6467,6 +6477,7 @@
"geo6/geocoder-php-geopunt-provider": "^1.0",
"geo6/geocoder-php-spw-provider": "^1.0",
"geocoder-php/arcgis-online-provider": "^4.0",
"geocoder-php/azure-maps-provider": "^1.2",
"geocoder-php/bing-maps-provider": "^4.0",
"geocoder-php/free-geoip-provider": "^4.1",
"geocoder-php/geo-plugin-provider": "^4.0",
Expand All @@ -6486,13 +6497,14 @@
"geocoder-php/pelias-provider": "^1.1",
"geocoder-php/photon-provider": "^0.1.0",
"geocoder-php/tomtom-provider": "^4.0",
"geocoder-php/yandex-provider": "^4.0"
"geocoder-php/yandex-provider": "^4.0",
"systonic/ban-france-provider": "^1.0"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-3.35",
"datestamp": "1697825623",
"version": "8.x-3.36",
"datestamp": "1700812620",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -18390,16 +18402,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.10.43",
"version": "1.10.44",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "2c4129f6ca8c7cfa870098884b8869b410a5a361"
"reference": "bf84367c53a23f759513985c54ffe0d0c249825b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/2c4129f6ca8c7cfa870098884b8869b410a5a361",
"reference": "2c4129f6ca8c7cfa870098884b8869b410a5a361",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/bf84367c53a23f759513985c54ffe0d0c249825b",
"reference": "bf84367c53a23f759513985c54ffe0d0c249825b",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -18448,7 +18460,7 @@
"type": "tidelift"
}
],
"time": "2023-11-19T19:55:25+00:00"
"time": "2023-11-21T16:30:46+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
Expand Down Expand Up @@ -26771,16 +26783,16 @@
},
{
"name": "twig/twig",
"version": "v2.15.5",
"version": "v2.15.6",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "fc02a6af3eeb97c4bf5650debc76c2eda85ac22e"
"reference": "ad637405a828601a56f32ccab9a85541c4b66c9d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/fc02a6af3eeb97c4bf5650debc76c2eda85ac22e",
"reference": "fc02a6af3eeb97c4bf5650debc76c2eda85ac22e",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/ad637405a828601a56f32ccab9a85541c4b66c9d",
"reference": "ad637405a828601a56f32ccab9a85541c4b66c9d",
"shasum": ""
},
"require": {
Expand All @@ -26791,7 +26803,7 @@
},
"require-dev": {
"psr/container": "^1.0",
"symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
"symfony/phpunit-bridge": "^5.4.9|^6.3"
},
"type": "library",
"extra": {
Expand Down Expand Up @@ -26835,7 +26847,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v2.15.5"
"source": "https://github.com/twigphp/Twig/tree/v2.15.6"
},
"funding": [
{
Expand All @@ -26847,7 +26859,7 @@
"type": "tidelift"
}
],
"time": "2023-05-03T17:49:41+00:00"
"time": "2023-11-21T17:34:48+00:00"
},
{
"name": "typo3/phar-stream-wrapper",
Expand Down Expand Up @@ -26906,7 +26918,7 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3390",
"version": "v0.0.3392",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
Expand Down Expand Up @@ -26942,7 +26954,7 @@
"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.3390"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3392"
},
"time": "2023-11-20T18:56:17+00:00"
},
Expand Down

0 comments on commit d3f7409

Please sign in to comment.