Skip to content

Commit

Permalink
Bump drupal/monolog from 2.2.0 to 3.0.2 (#17235)
Browse files Browse the repository at this point in the history 
* 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] <[email protected]>

* 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] <[email protected]>

* fix for custom code to align with monolog updates

* updated composer.lock

* updated composer.lock

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Edmund Dunn <[email protected]>
  • Loading branch information
@dependabot @edmund-dunn
dependabot[bot] and edmund-dunn authored Feb 21, 2024
1 parent 04f21ac commit 5416435
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 43 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
89 changes: 48 additions & 41 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": "c0265aabcf4e876c01f286498a53d195",
"content-hash": "7e1371f2b36ff27b189d5b8c15a92524",
"packages": [
{
"name": "asm89/stack-cors",
Expand Down Expand Up @@ -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"
Expand All @@ -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"
},
{
Expand All @@ -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"
}
},
{
Expand Down Expand Up @@ -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"
},
Expand All @@ -17149,7 +17156,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "2.x-dev"
"dev-main": "3.x-dev"
}
},
"autoload": {
Expand Down Expand Up @@ -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": [
{
Expand All @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion docroot/modules/custom/va_gov_backend/src/Logger/Processor/DatadogApmProcessor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 5416435

Please sign in to comment.