From cc3a4db44e7d783c433bed90ff0fbce3e4e1d1ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 07:56:20 -0800 Subject: [PATCH 1/4] Bump datadog/dd-trace from 0.97.0 to 0.98.0 (#17301) Bumps [datadog/dd-trace](https://github.com/DataDog/dd-trace-php) from 0.97.0 to 0.98.0. - [Release notes](https://github.com/DataDog/dd-trace-php/releases) - [Commits](https://github.com/DataDog/dd-trace-php/compare/0.97.0...0.98.0) --- updated-dependencies: - dependency-name: datadog/dd-trace dependency-type: direct:production update-type: version-update:semver-minor ... 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 050d4a3be1..137f04e897 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "composer/installers": "^2.2", "consolidation/site-process": "^5.2", "cweagans/composer-patches": "^1.7", - "datadog/dd-trace": "^0.97.0", + "datadog/dd-trace": "^0.98.0", "dealerdirect/phpcodesniffer-composer-installer": "0.7.2", "drupal/address": "^1.4", "drupal/admin_feedback": "^2.2", diff --git a/composer.lock b/composer.lock index d3dc6b4a96..9965b539df 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": "270314988fc3bc6613bb38e386c13544", + "content-hash": "2f007998a29adf11a319f62126b2dd24", "packages": [ { "name": "asm89/stack-cors", @@ -1175,16 +1175,16 @@ }, { "name": "datadog/dd-trace", - "version": "0.97.0", + "version": "0.98.0", "source": { "type": "git", "url": "https://github.com/DataDog/dd-trace-php.git", - "reference": "e76850105e99ba5d5b36697b3e4553ee70cfdae9" + "reference": "b25dc1e3fc8e8f3906e183fed5ed62d3aac19381" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/DataDog/dd-trace-php/zipball/e76850105e99ba5d5b36697b3e4553ee70cfdae9", - "reference": "e76850105e99ba5d5b36697b3e4553ee70cfdae9", + "url": "https://api.github.com/repos/DataDog/dd-trace-php/zipball/b25dc1e3fc8e8f3906e183fed5ed62d3aac19381", + "reference": "b25dc1e3fc8e8f3906e183fed5ed62d3aac19381", "shasum": "" }, "require": { @@ -1273,9 +1273,9 @@ ], "support": { "issues": "https://github.com/DataDog/dd-trace-php/issues", - "source": "https://github.com/DataDog/dd-trace-php/tree/0.97.0" + "source": "https://github.com/DataDog/dd-trace-php/tree/0.98.0" }, - "time": "2024-01-18T10:15:17+00:00" + "time": "2024-02-19T18:55:36+00:00" }, { "name": "davedevelopment/stiphle", From 15fe16fda6442106e725fb432e50e26df0c8c828 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:28:25 -0800 Subject: [PATCH 2/4] Bump masci/datadog from 1.6.0 to 1.7.1 (#17141) Bumps [masci/datadog](https://github.com/masci/datadog) from 1.6.0 to 1.7.1. - [Release notes](https://github.com/masci/datadog/releases) - [Commits](https://github.com/masci/datadog/compare/68f124e429317cc02e17965df6d08c75056cb45d...a5d283e78e33a688ed08a96ba64440505e645a8c) --- updated-dependencies: - dependency-name: masci/datadog dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> --- .github/workflows/default-branch-datadog-metrics.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/default-branch-datadog-metrics.yml b/.github/workflows/default-branch-datadog-metrics.yml index 849868d7af..d5d4f27561 100644 --- a/.github/workflows/default-branch-datadog-metrics.yml +++ b/.github/workflows/default-branch-datadog-metrics.yml @@ -58,7 +58,7 @@ jobs: env: GITHUB_REPOSITORY: "${{ github.repository }}" - name: Send Metrics to DataDog. - uses: masci/datadog@68f124e429317cc02e17965df6d08c75056cb45d # v1.6.0 + uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1 with: api-key: ${{ secrets.DATADOG_API_KEY }} api-url: https://api.ddog-gov.com @@ -150,7 +150,7 @@ jobs: echo "Lines Denominator: ${lines_denominator}"; - name: Send Metrics to DataDog. - uses: masci/datadog@68f124e429317cc02e17965df6d08c75056cb45d # v1.6.0 + uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1 with: api-key: ${{ secrets.DATADOG_API_KEY }} api-url: https://api.ddog-gov.com @@ -271,7 +271,7 @@ jobs: echo "nonpublic_class_constants=$(jq '.nonPublicClassConstants' phploc.json)" >> $GITHUB_OUTPUT - name: Send Metrics to DataDog. - uses: masci/datadog@68f124e429317cc02e17965df6d08c75056cb45d # v1.6.0 + uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1 with: api-key: ${{ secrets.DATADOG_API_KEY }} api-url: https://api.ddog-gov.com From 458a148f995cbd934dfd2faafd5ed799a5103657 Mon Sep 17 00:00:00 2001 From: Daniel Sasser Date: Wed, 21 Feb 2024 11:45:37 -0800 Subject: [PATCH 3/4] VACMS-17115: Adds ECA and friends to the platform. (#17265) --- composer.json | 4 +- composer.lock | 288 +++++++- config/sync/core.extension.yml | 5 + config/sync/eca.eca.test.yml | 13 + config/sync/eca.settings.yml | 10 + .../sync/language/es/views.view.eca_log.yml | 50 ++ config/sync/views.view.eca_log.yml | 619 ++++++++++++++++++ 7 files changed, 987 insertions(+), 2 deletions(-) create mode 100644 config/sync/eca.eca.test.yml create mode 100644 config/sync/eca.settings.yml create mode 100644 config/sync/language/es/views.view.eca_log.yml create mode 100644 config/sync/views.view.eca_log.yml diff --git a/composer.json b/composer.json index 137f04e897..2178803e63 100644 --- a/composer.json +++ b/composer.json @@ -33,8 +33,8 @@ "drupal/better_exposed_filters": "^6.0", "drupal/cer": "^5.0@beta", "drupal/change_labels": "dev-3326097-remove-dependency-on-drupal-autoservices#7f92f90b456ac2f394dd434257e39e1d9b3086eb", - "drupal/clientside_validation": "^4.0", "drupal/ckeditor_abbreviation": "^4.0@alpha", + "drupal/clientside_validation": "^4.0", "drupal/coder": "^8.3", "drupal/codit_menu_tools": "^1.0@alpha", "drupal/components": "^3.0@beta", @@ -60,6 +60,8 @@ "drupal/dropzonejs": "^2.0", "drupal/dynamic_entity_reference": "^3.0", "drupal/easy_breadcrumb": "^2.0", + "drupal/eca": "^1.1", + "drupal/eca_cm": "^1.0", "drupal/embed": "^1.3", "drupal/entity_block": "^1.0@beta", "drupal/entity_browser": "^2.4", diff --git a/composer.lock b/composer.lock index 9965b539df..305c3e9685 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": "2f007998a29adf11a319f62126b2dd24", + "content-hash": "c0265aabcf4e876c01f286498a53d195", "packages": [ { "name": "asm89/stack-cors", @@ -2190,6 +2190,67 @@ ], "time": "2023-05-17T18:32:04+00:00" }, + { + "name": "dragonmantank/cron-expression", + "version": "v3.3.3", + "source": { + "type": "git", + "url": "https://github.com/dragonmantank/cron-expression.git", + "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", + "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0", + "webmozart/assert": "^1.0" + }, + "replace": { + "mtdowling/cron-expression": "^1.0" + }, + "require-dev": { + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-webmozart-assert": "^1.0", + "phpunit/phpunit": "^7.0|^8.0|^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Cron\\": "src/Cron/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Chris Tankersley", + "email": "chris@ctankersley.com", + "homepage": "https://github.com/dragonmantank" + } + ], + "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due", + "keywords": [ + "cron", + "schedule" + ], + "support": { + "issues": "https://github.com/dragonmantank/cron-expression/issues", + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3" + }, + "funding": [ + { + "url": "https://github.com/dragonmantank", + "type": "github" + } + ], + "time": "2023-08-10T19:36:49+00:00" + }, { "name": "drupal/address", "version": "1.12.0", @@ -5025,6 +5086,174 @@ "issues": "https://www.drupal.org/project/issues/easy_breadcrumb" } }, + { + "name": "drupal/eca", + "version": "1.1.4", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/eca.git", + "reference": "1.1.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/eca-1.1.4.zip", + "reference": "1.1.4", + "shasum": "fce478b8c6224997dc858bff1f8f57523c870de7" + }, + "require": { + "dragonmantank/cron-expression": "^3.1", + "drupal/core": "^9.4 || ^10", + "ext-dom": "*", + "ext-json": "*", + "mtownsend/xml-to-array": "^2.0", + "php": ">=7.4" + }, + "require-dev": { + "drupal/eca_ui": "*", + "drupal/token": "^1.10" + }, + "suggest": { + "drupal/context_stack": "Integrates ECA with Context Stacks for more fine-grained control", + "drupal/eca_state_machine": "Integrates ECA with State Machine functionality", + "drupal/eca_tamper": "Integrates ECA with the Tamper API", + "drupal/entity_share": "Integrates ECA with Entity Share functionality", + "drupal/group_action": "Integrates ECA with Group Actions if you're using groups", + "drupal/token": "Provides the token browser in the UI and offers more token values" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.1.4", + "datestamp": "1689338278", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "drush.services.yml": "^9 || ^10 || ^11" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "boromino", + "homepage": "https://www.drupal.org/user/859722" + }, + { + "name": "danielspeicher", + "homepage": "https://www.drupal.org/user/3621778" + }, + { + "name": "jurgenhaas", + "homepage": "https://www.drupal.org/user/168924" + } + ], + "description": "Event, Conditions, Actions - powerful, versatile, and user-friendly rules engine for Drupal", + "homepage": "https://www.drupal.org/project/eca", + "support": { + "source": "https://drupal.org/project/eca", + "issues": "https://drupal.org/project/issues/eca" + } + }, + { + "name": "drupal/eca_cm", + "version": "1.0.7", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/eca_cm.git", + "reference": "1.0.7" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/eca_cm-1.0.7.zip", + "reference": "1.0.7", + "shasum": "86d9866232c41fbd71573b88f42bcb270bfcd3dc" + }, + "require": { + "drupal/core": "^9 || ^10", + "drupal/eca": "^1", + "drupal/eca_ui": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.0.7", + "datestamp": "1692266259", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "mxh", + "homepage": "https://www.drupal.org/user/1124384" + }, + { + "name": "qichanghai", + "homepage": "https://www.drupal.org/user/3092355" + } + ], + "description": "A Drupal module that provides a modeller for ECA solely built on top of Drupal core and ECA core.", + "homepage": "https://www.drupal.org/project/eca_cm", + "support": { + "source": "https://drupal.org/project/eca_cm", + "issues": "https://drupal.org/project/issues/eca_cm" + } + }, + { + "name": "drupal/eca_ui", + "version": "1.1.4", + "require": { + "drupal/core": "^9 || ^10", + "drupal/eca": "*" + }, + "type": "metapackage", + "extra": { + "drupal": { + "version": "1.1.4", + "datestamp": "1689338278", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "boromino", + "homepage": "https://www.drupal.org/user/859722" + }, + { + "name": "danielspeicher", + "homepage": "https://www.drupal.org/user/3621778" + }, + { + "name": "jurgenhaas", + "homepage": "https://www.drupal.org/user/168924" + } + ], + "description": "Provides a user interface for managing ECA models.", + "homepage": "https://www.drupal.org/project/eca", + "support": { + "source": "https://git.drupalcode.org/project/eca" + } + }, { "name": "drupal/embed", "version": "1.7.0", @@ -10022,6 +10251,10 @@ "name": "shadcn", "homepage": "https://shadcn.com" }, + { + "name": "minnur", + "homepage": "https://www.drupal.org/user/702026" + }, { "name": "roaguicr", "homepage": "https://www.drupal.org/user/2334450" @@ -16958,6 +17191,59 @@ ], "time": "2023-10-27T15:25:26+00:00" }, + { + "name": "mtownsend/xml-to-array", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/mtownsend5512/xml-to-array.git", + "reference": "0734720a8462dba36d90fb8b2723bf46af0091f4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mtownsend5512/xml-to-array/zipball/0734720a8462dba36d90fb8b2723bf46af0091f4", + "reference": "0734720a8462dba36d90fb8b2723bf46af0091f4", + "shasum": "" + }, + "require": { + "php": "~7.0|~8.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Mtownsend\\XmlToArray\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mark Townsend", + "email": "mtownsend5512@gmail.com", + "role": "Developer" + } + ], + "description": "Easily convert valid xml to a php array.", + "keywords": [ + "array", + "convert", + "laravel", + "xml" + ], + "support": { + "issues": "https://github.com/mtownsend5512/xml-to-array/issues", + "source": "https://github.com/mtownsend5512/xml-to-array/tree/2.0.0" + }, + "time": "2021-02-27T22:39:18+00:00" + }, { "name": "myclabs/deep-copy", "version": "1.11.1", diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index d7ad4a2d38..fea07b9194 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -58,6 +58,11 @@ module: dynamic_entity_reference: 0 dynamic_page_cache: 0 easy_breadcrumb: 0 + eca: 0 + eca_base: 0 + eca_cm: 0 + eca_ui: 0 + eca_views: 0 editor: 0 embed: 0 entity_block: 0 diff --git a/config/sync/eca.eca.test.yml b/config/sync/eca.eca.test.yml new file mode 100644 index 0000000000..039b2e051c --- /dev/null +++ b/config/sync/eca.eca.test.yml @@ -0,0 +1,13 @@ +uuid: 107ef63e-ce69-45fd-b6f4-4723b95f1994 +langcode: en +status: false +dependencies: { } +id: test +modeller: core +label: Test +version: null +weight: null +events: { } +conditions: { } +gateways: { } +actions: { } diff --git a/config/sync/eca.settings.yml b/config/sync/eca.settings.yml new file mode 100644 index 0000000000..b805adfeb1 --- /dev/null +++ b/config/sync/eca.settings.yml @@ -0,0 +1,10 @@ +_core: + default_config_hash: crbLzxE1culnNNbMcnjEQy5F_PmdYkkXBTvemcgc2kg +log_level: 3 +documentation_domain: 'https://ecaguide.org' +user: '' +dependency_calculation: + - bundle + - field_storage + - field_config + - new_field_config diff --git a/config/sync/language/es/views.view.eca_log.yml b/config/sync/language/es/views.view.eca_log.yml new file mode 100644 index 0000000000..11fe1a1101 --- /dev/null +++ b/config/sync/language/es/views.view.eca_log.yml @@ -0,0 +1,50 @@ +display: + default: + display_title: 'Por defecto' + display_options: + title: Registro + fields: + name: + label: Usuario + separator: ', ' + timestamp: + label: Hora + message: + label: Mensaje + variables: + label: Comodines + pager: + options: + tags: + next: ›› + previous: ‹‹ + first: '« Primero' + last: 'Último »' + expose: + items_per_page_label: 'Elementos por página' + items_per_page_options_all_label: '- Todo -' + offset_label: Desplazamiento + exposed_form: + options: + submit_button: Aplicar + reset_button_label: Restablecer + exposed_sorts_label: 'Ordenar por' + sort_asc_label: Asc + sort_desc_label: Desc + filters: + timestamp: + expose: + label: Desde + timestamp_1: + expose: + label: Para + page_1: + display_title: Página + display_options: + menu: + title: Registro + page_2: + display_title: 'Página 2' + display_options: + menu: + title: Registro diff --git a/config/sync/views.view.eca_log.yml b/config/sync/views.view.eca_log.yml new file mode 100644 index 0000000000..8fc374704f --- /dev/null +++ b/config/sync/views.view.eca_log.yml @@ -0,0 +1,619 @@ +uuid: f390cf15-8e20-45e7-8ec4-b7fad0e875ef +langcode: en +status: true +dependencies: + config: + - system.menu.admin + module: + - dblog + - smart_date + - user +_core: + default_config_hash: D_mojRjxWhgQElK_31fBHCqXm829yxmgsjq7MeInnMg +id: eca_log +label: 'ECA Log' +module: views +description: '' +tag: '' +base_table: watchdog +base_field: wid +display: + default: + id: default + display_title: Default + display_plugin: default + position: 0 + display_options: + title: Log + fields: + name: + id: name + table: users_field_data + field: name + relationship: uid + group_type: group + admin_label: '' + entity_type: user + entity_field: name + plugin_id: field + label: User + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: user_name + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + timestamp: + id: timestamp + table: watchdog + field: timestamp + relationship: none + group_type: group + admin_label: '' + plugin_id: date + label: Time + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + date_format: html_time + custom_date_format: '' + timezone: '' + message: + id: message + table: watchdog + field: message + relationship: none + group_type: group + admin_label: '' + plugin_id: dblog_message + label: Message + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + replace_variables: true + variables: + id: variables + table: watchdog + field: variables + relationship: none + group_type: group + admin_label: '' + plugin_id: serialized + label: Tokens + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + format: unserialized + key: '' + type: + id: type + table: watchdog + field: type + relationship: none + group_type: group + admin_label: '' + plugin_id: standard + label: '' + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + pager: + type: full + options: + offset: 0 + items_per_page: 50 + total_pages: null + id: 0 + tags: + next: ›› + previous: ‹‹ + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'administer eca' + cache: + type: none + options: { } + empty: { } + sorts: + wid: + id: wid + table: watchdog + field: wid + relationship: none + group_type: group + admin_label: '' + plugin_id: standard + order: ASC + expose: + label: '' + field_identifier: '' + exposed: false + arguments: { } + filters: + combine: + id: combine + table: views + field: combine + relationship: none + group_type: group + admin_label: '' + plugin_id: combine + operator: '=' + value: eca + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + placeholder: '' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + fields: + type: type + variables: + id: variables + table: watchdog + field: variables + relationship: none + group_type: group + admin_label: '' + plugin_id: string + operator: contains + value: '' + group: 1 + exposed: true + expose: + operator_id: variables_op + label: 'Message contains' + description: '' + use_operator: false + operator: variables_op + operator_limit_selection: false + operator_list: { } + identifier: variables + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + content_editor: '0' + administrator: '0' + placeholder: '' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + timestamp: + id: timestamp + table: watchdog + field: timestamp + relationship: none + group_type: group + admin_label: '' + plugin_id: date + operator: '>=' + value: + min: '' + max: '' + value: '-1 hour' + type: offset + group: 1 + exposed: true + expose: + operator_id: timestamp_op + label: From + description: '' + use_operator: false + operator: timestamp_op + operator_limit_selection: false + operator_list: { } + identifier: from + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + content_editor: '0' + administrator: '0' + min_placeholder: '' + max_placeholder: '' + placeholder: '' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + timestamp_1: + id: timestamp_1 + table: watchdog + field: timestamp + relationship: none + group_type: group + admin_label: '' + plugin_id: date + operator: '<=' + value: + min: '' + max: '' + value: now + type: offset + group: 1 + exposed: true + expose: + operator_id: timestamp_1_op + label: To + description: '' + use_operator: false + operator: timestamp_1_op + operator_limit_selection: false + operator_list: { } + identifier: to + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + content_editor: '0' + administrator: '0' + min_placeholder: '' + max_placeholder: '' + placeholder: '' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: + uid: + id: uid + table: watchdog + field: uid + relationship: none + group_type: group + admin_label: uid + plugin_id: standard + required: false + header: { } + footer: { } + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } + page_1: + id: page_1 + display_title: Page + display_plugin: page + position: 1 + display_options: + display_extenders: { } + path: admin/config/workflow/eca/log + menu: + type: tab + title: Log + description: '' + weight: 99 + expanded: false + menu_name: admin + parent: entity.eca.collection + context: '0' + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } + page_2: + id: page_2 + display_title: 'Page 2' + display_plugin: page + position: 2 + display_options: + display_extenders: { } + path: admin/config/workflow/eca/log + menu: + type: normal + title: Log + description: '' + weight: 99 + expanded: false + menu_name: admin + parent: entity.eca.collection + context: '0' + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } From 0b8858ad8375789f6a4a59bf456b72f8305a6af8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 12:31:43 -0800 Subject: [PATCH 4/4] Bump drupal/monolog from 2.2.0 to 3.0.2 (#17235) * Bump drupal/monolog from 2.2.0 to 3.0.2 Bumps drupal/monolog from 2.2.0 to 3.0.2. --- updated-dependencies: - dependency-name: drupal/monolog dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Bump drupal/monolog from 2.2.0 to 3.0.2 Bumps drupal/monolog from 2.2.0 to 3.0.2. --- updated-dependencies: - dependency-name: drupal/monolog dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * fix for custom code to align with monolog updates * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 89 ++++++++++--------- .../Logger/Processor/DatadogApmProcessor.php | 3 +- 3 files changed, 51 insertions(+), 43 deletions(-) diff --git a/composer.json b/composer.json index 2178803e63..f2e35387be 100644 --- a/composer.json +++ b/composer.json @@ -134,7 +134,7 @@ "drupal/migrate_tools": "^6.0", "drupal/migration_tools": "^2.8", "drupal/mimemail": "^1.0@alpha", - "drupal/monolog": "^2.0", + "drupal/monolog": "^3.0", "drupal/next": "^1.1", "drupal/no_table_drag": "^2.0@alpha", "drupal/node_link_report": "^1.14", diff --git a/composer.lock b/composer.lock index 305c3e9685..ed1f3ff96c 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": "c0265aabcf4e876c01f286498a53d195", + "content-hash": "7e1371f2b36ff27b189d5b8c15a92524", "packages": [ { "name": "asm89/stack-cors", @@ -10139,28 +10139,36 @@ }, { "name": "drupal/monolog", - "version": "2.2.0", + "version": "3.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/monolog.git", - "reference": "2.2.0" + "reference": "3.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/monolog-2.2.0.zip", - "reference": "2.2.0", - "shasum": "3f243ccfb19cb30c75637882e24b1d8acfdb2f9a" + "url": "https://ftp.drupal.org/files/projects/monolog-3.0.2.zip", + "reference": "3.0.2", + "shasum": "a88e8249028e56a21c4472891381412b9733f768" }, "require": { - "drupal/core": "^8.8 || ^9 || ^10", - "monolog/monolog": "^2.8.0", - "php": "^7.4|^8" + "drupal/core": "^10", + "monolog/monolog": "^3.2.0", + "php": "^8.1.0" + }, + "require-dev": { + "mglaman/phpstan-drupal": "^1.1", + "phpstan/extension-installer": "^1.3", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-deprecation-rules": "*", + "phpstan/phpstan-strict-rules": "^1.5", + "previousnext/coding-standard": "^1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.2.0", - "datestamp": "1662121628", + "version": "3.0.2", + "datestamp": "1707845433", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10178,14 +10186,14 @@ ], "authors": [ { - "name": "Chris Pliakas", + "name": "Luca Lusso", "homepage": "https://www.drupal.org/user/266779", - "email": "opensource@chrispliakas.com", + "email": "lussoluca@gmail.com", "role": "Project Lead" }, { "name": "See contributors", - "homepage": "http://drupal.org/node/1937716/committers", + "homepage": "https://drupal.org/node/1937716/committers", "role": "Developer" }, { @@ -10194,10 +10202,10 @@ } ], "description": "A Framework for integrating with the Monolog library.", - "homepage": "http://drupal.org/project/monolog", + "homepage": "https://drupal.org/project/monolog", "support": { "source": "https://git.drupalcode.org/project/monolog", - "issues": "http://drupal.org/project/issues/monolog" + "issues": "https://drupal.org/project/issues/monolog" } }, { @@ -17091,42 +17099,41 @@ }, { "name": "monolog/monolog", - "version": "2.9.2", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" + "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448", + "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448", "shasum": "" }, "require": { - "php": ">=7.2", - "psr/log": "^1.0.1 || ^2.0 || ^3.0" + "php": ">=8.1", + "psr/log": "^2.0 || ^3.0" }, "provide": { - "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" + "psr/log-implementation": "3.0.0" }, "require-dev": { - "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "aws/aws-sdk-php": "^3.0", "doctrine/couchdb": "~1.0@dev", "elasticsearch/elasticsearch": "^7 || ^8", "ext-json": "*", - "graylog2/gelf-php": "^1.4.2 || ^2@dev", - "guzzlehttp/guzzle": "^7.4", + "graylog2/gelf-php": "^1.4.2 || ^2.0", + "guzzlehttp/guzzle": "^7.4.5", "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "phpspec/prophecy": "^1.15", - "phpstan/phpstan": "^0.12.91", - "phpunit/phpunit": "^8.5.14", - "predis/predis": "^1.1 || ^2.0", - "rollbar/rollbar": "^1.3 || ^2 || ^3", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-strict-rules": "^1.4", + "phpunit/phpunit": "^10.1", + "predis/predis": "^1.1 || ^2", "ruflin/elastica": "^7", - "swiftmailer/swiftmailer": "^5.3|^6.0", "symfony/mailer": "^5.4 || ^6", "symfony/mime": "^5.4 || ^6" }, @@ -17149,7 +17156,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -17177,7 +17184,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.2" + "source": "https://github.com/Seldaek/monolog/tree/3.5.0" }, "funding": [ { @@ -17189,7 +17196,7 @@ "type": "tidelift" } ], - "time": "2023-10-27T15:25:26+00:00" + "time": "2023-10-27T15:32:31+00:00" }, { "name": "mtownsend/xml-to-array", @@ -18719,16 +18726,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" + "reference": "bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353", + "reference": "bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353", "shasum": "" }, "require": { @@ -18771,9 +18778,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.1" }, - "time": "2024-01-11T11:49:22+00:00" + "time": "2024-01-18T19:15:27+00:00" }, { "name": "phpmailer/phpmailer", diff --git a/docroot/modules/custom/va_gov_backend/src/Logger/Processor/DatadogApmProcessor.php b/docroot/modules/custom/va_gov_backend/src/Logger/Processor/DatadogApmProcessor.php index 6aa119fc7b..db7e37d58b 100644 --- a/docroot/modules/custom/va_gov_backend/src/Logger/Processor/DatadogApmProcessor.php +++ b/docroot/modules/custom/va_gov_backend/src/Logger/Processor/DatadogApmProcessor.php @@ -3,6 +3,7 @@ namespace Drupal\va_gov_backend\Logger\Processor; use Drupal\va_gov_backend\Service\DatadogContextProviderInterface; +use Monolog\LogRecord; use Monolog\Processor\ProcessorInterface; /** @@ -100,7 +101,7 @@ public function shouldAlterRecord(array $record): bool { /** * {@inheritdoc} */ - public function __invoke(array $record): array { + public function __invoke(LogRecord $record): array { if (!$this->shouldAlterRecord($record)) { return $record; }