From 5ecc8114be26e5ec0e4c3767ab78d34465f4ab24 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Wed, 23 Feb 2022 12:10:19 +0000
Subject: [PATCH] Issue #3266017 by xjm, longwave: Update psr/log to v2
---
composer.lock | 48 +++++++++----------
.../Metapackage/CoreRecommended/composer.json | 4 +-
core/composer.json | 2 +-
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/composer.lock b/composer.lock
index 1fd08dd451e2..764e5c00e3e6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -448,7 +448,7 @@
"dist": {
"type": "path",
"url": "core",
- "reference": "ffba733b29880c8f8e6d29445347b7570f98438f"
+ "reference": "5fd45458c0f8e0fb2339bcf1d4359d4407da26c3"
},
"require": {
"asm89/stack-cors": "^2.0.2",
@@ -473,7 +473,7 @@
"masterminds/html5": "^2.1",
"pear/archive_tar": "^1.4.14",
"php": ">=8.1.0",
- "psr/log": "^1.0",
+ "psr/log": "^2.0",
"symfony/console": "^5.4",
"symfony/dependency-injection": "^6.0",
"symfony/event-dispatcher": "^6.0",
@@ -865,12 +865,12 @@
}
},
"autoload": {
- "psr-4": {
- "GuzzleHttp\\": "src/"
- },
"files": [
"src/functions_include.php"
- ]
+ ],
+ "psr-4": {
+ "GuzzleHttp\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -972,12 +972,12 @@
}
},
"autoload": {
- "psr-4": {
- "GuzzleHttp\\Promise\\": "src/"
- },
"files": [
"src/functions_include.php"
- ]
+ ],
+ "psr-4": {
+ "GuzzleHttp\\Promise\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1285,16 +1285,16 @@
},
{
"name": "laminas/laminas-stdlib",
- "version": "3.7.0",
+ "version": "3.7.1",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-stdlib.git",
- "reference": "cba75fad2053bb5dc8d3e7f5e62b61d75eecfaf1"
+ "reference": "bcd869e2fe88d567800057c1434f2380354fe325"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/cba75fad2053bb5dc8d3e7f5e62b61d75eecfaf1",
- "reference": "cba75fad2053bb5dc8d3e7f5e62b61d75eecfaf1",
+ "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/bcd869e2fe88d567800057c1434f2380354fe325",
+ "reference": "bcd869e2fe88d567800057c1434f2380354fe325",
"shasum": ""
},
"require": {
@@ -1340,7 +1340,7 @@
"type": "community_bridge"
}
],
- "time": "2022-01-10T11:18:55+00:00"
+ "time": "2022-01-21T15:50:46+00:00"
},
{
"name": "masterminds/html5",
@@ -1963,30 +1963,30 @@
},
{
"name": "psr/log",
- "version": "1.1.4",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+ "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
- "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376",
+ "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=8.0.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
"psr-4": {
- "Psr\\Log\\": "Psr/Log/"
+ "Psr\\Log\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2007,9 +2007,9 @@
"psr-3"
],
"support": {
- "source": "https://github.com/php-fig/log/tree/1.1.4"
+ "source": "https://github.com/php-fig/log/tree/2.0.0"
},
- "time": "2021-05-03T11:20:27+00:00"
+ "time": "2021-07-14T16:41:46+00:00"
},
{
"name": "ralouphie/getallheaders",
diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json
index 6dce419a9212..3bd5416ce92f 100644
--- a/composer/Metapackage/CoreRecommended/composer.json
+++ b/composer/Metapackage/CoreRecommended/composer.json
@@ -18,7 +18,7 @@
"guzzlehttp/psr7": "2.1.0",
"laminas/laminas-escaper": "2.9.0",
"laminas/laminas-feed": "2.16.0",
- "laminas/laminas-stdlib": "3.7.0",
+ "laminas/laminas-stdlib": "3.7.1",
"masterminds/html5": "2.7.5",
"pear/archive_tar": "1.4.14",
"pear/console_getopt": "v1.4.3",
@@ -30,7 +30,7 @@
"psr/http-client": "1.0.1",
"psr/http-factory": "1.0.1",
"psr/http-message": "1.0.1",
- "psr/log": "1.1.4",
+ "psr/log": "2.0.0",
"ralouphie/getallheaders": "3.0.3",
"symfony/console": "v5.4.3",
"symfony/dependency-injection": "v6.0.3",
diff --git a/core/composer.json b/core/composer.json
index 3ca449e587f0..54a7e93fd1ec 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -41,7 +41,7 @@
"composer/semver": "^3.0",
"asm89/stack-cors": "^2.0.2",
"pear/archive_tar": "^1.4.14",
- "psr/log": "^1.0"
+ "psr/log": "^2.0"
},
"conflict": {
"drush/drush": "<8.1.10"
--
GitLab