From b47d7a0f819fac8bad85c82384aa3e2e28f46eec Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Mon, 11 Nov 2024 18:37:32 +0000
Subject: [PATCH] Issue #3484463 by andypost, benjifisher: Upgrade
open-telemetry packages for PHP 8.4
---
composer.json | 3 +-
composer.lock | 485 +++++++++++++++---
.../PinnedDevDependencies/composer.json | 21 +-
composer/Plugin/VendorHardening/Config.php | 1 +
core/misc/cspell/dictionary.txt | 2 +
5 files changed, 444 insertions(+), 68 deletions(-)
diff --git a/composer.json b/composer.json
index 37ddea959623..5fcb341d5c7e 100644
--- a/composer.json
+++ b/composer.json
@@ -64,7 +64,8 @@
"drupal/core-project-message": true,
"drupal/core-vendor-hardening": true,
"php-http/discovery": true,
- "phpstan/extension-installer": true
+ "phpstan/extension-installer": true,
+ "tbachert/spi": false
}
},
"extra": {
diff --git a/composer.lock b/composer.lock
index 8e3e450a0358..51768799ec7d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4633,6 +4633,66 @@
},
"time": "2023-12-09T11:30:50+00:00"
},
+ {
+ "name": "brick/math",
+ "version": "0.12.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/brick/math.git",
+ "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
+ "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^8.1"
+ },
+ "require-dev": {
+ "php-coveralls/php-coveralls": "^2.2",
+ "phpunit/phpunit": "^10.1",
+ "vimeo/psalm": "5.16.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Brick\\Math\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "Arbitrary-precision arithmetic library",
+ "keywords": [
+ "Arbitrary-precision",
+ "BigInteger",
+ "BigRational",
+ "arithmetic",
+ "bigdecimal",
+ "bignum",
+ "bignumber",
+ "brick",
+ "decimal",
+ "integer",
+ "math",
+ "mathematics",
+ "rational"
+ ],
+ "support": {
+ "issues": "https://github.com/brick/math/issues",
+ "source": "https://github.com/brick/math/tree/0.12.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/BenMorel",
+ "type": "github"
+ }
+ ],
+ "time": "2023-11-29T23:19:16+00:00"
+ },
{
"name": "colinodell/psr-testlogger",
"version": "v1.3.0",
@@ -5470,16 +5530,16 @@
},
{
"name": "google/protobuf",
- "version": "v3.25.4",
+ "version": "v4.28.3",
"source": {
"type": "git",
"url": "https://github.com/protocolbuffers/protobuf-php.git",
- "reference": "749f6c8e99a7fe51d096c2db656a4af9a46a6b5e"
+ "reference": "c5c311e0f3d89928251ac5a2f0e3db283612c100"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/749f6c8e99a7fe51d096c2db656a4af9a46a6b5e",
- "reference": "749f6c8e99a7fe51d096c2db656a4af9a46a6b5e",
+ "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/c5c311e0f3d89928251ac5a2f0e3db283612c100",
+ "reference": "c5c311e0f3d89928251ac5a2f0e3db283612c100",
"shasum": ""
},
"require": {
@@ -5508,9 +5568,9 @@
"proto"
],
"support": {
- "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.25.4"
+ "source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.28.3"
},
- "time": "2024-07-24T17:10:25+00:00"
+ "time": "2024-10-22T22:27:17+00:00"
},
{
"name": "justinrainbow/json-schema",
@@ -6023,35 +6083,104 @@
},
"time": "2024-07-01T20:03:41+00:00"
},
+ {
+ "name": "nyholm/psr7-server",
+ "version": "1.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Nyholm/psr7-server.git",
+ "reference": "4335801d851f554ca43fa6e7d2602141538854dc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Nyholm/psr7-server/zipball/4335801d851f554ca43fa6e7d2602141538854dc",
+ "reference": "4335801d851f554ca43fa6e7d2602141538854dc",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1 || ^8.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "require-dev": {
+ "nyholm/nsa": "^1.1",
+ "nyholm/psr7": "^1.3",
+ "phpunit/phpunit": "^7.0 || ^8.5 || ^9.3"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Nyholm\\Psr7Server\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com"
+ },
+ {
+ "name": "Martijn van der Ven",
+ "email": "martijn@vanderven.se"
+ }
+ ],
+ "description": "Helper classes to handle PSR-7 server requests",
+ "homepage": "http://tnyholm.se",
+ "keywords": [
+ "psr-17",
+ "psr-7"
+ ],
+ "support": {
+ "issues": "https://github.com/Nyholm/psr7-server/issues",
+ "source": "https://github.com/Nyholm/psr7-server/tree/1.1.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/Zegnat",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/nyholm",
+ "type": "github"
+ }
+ ],
+ "time": "2023-11-08T09:30:43+00:00"
+ },
{
"name": "open-telemetry/api",
- "version": "1.0.3",
+ "version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/opentelemetry-php/api.git",
- "reference": "87de95d926f46262885d0d390060c095af13e2e5"
+ "reference": "542064815d38a6df55af7957cd6f1d7d967c99c6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/87de95d926f46262885d0d390060c095af13e2e5",
- "reference": "87de95d926f46262885d0d390060c095af13e2e5",
+ "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/542064815d38a6df55af7957cd6f1d7d967c99c6",
+ "reference": "542064815d38a6df55af7957cd6f1d7d967c99c6",
"shasum": ""
},
"require": {
"open-telemetry/context": "^1.0",
- "php": "^7.4 || ^8.0",
+ "php": "^8.1",
"psr/log": "^1.1|^2.0|^3.0",
- "symfony/polyfill-php80": "^1.26",
- "symfony/polyfill-php81": "^1.26",
"symfony/polyfill-php82": "^1.26"
},
"conflict": {
- "open-telemetry/sdk": "<=1.0.4"
+ "open-telemetry/sdk": "<=1.0.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.0.x-dev"
+ "dev-main": "1.1.x-dev"
+ },
+ "spi": {
+ "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\HookManagerInterface": [
+ "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\ExtensionHookManager"
+ ]
}
},
"autoload": {
@@ -6088,26 +6217,24 @@
"issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
"source": "https://github.com/open-telemetry/opentelemetry-php"
},
- "time": "2024-02-06T01:32:25+00:00"
+ "time": "2024-10-15T22:42:37+00:00"
},
{
"name": "open-telemetry/context",
- "version": "1.0.2",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/opentelemetry-php/context.git",
- "reference": "e9d254a7c89885e63fd2fde54e31e81aaaf52b7c"
+ "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/e9d254a7c89885e63fd2fde54e31e81aaaf52b7c",
- "reference": "e9d254a7c89885e63fd2fde54e31e81aaaf52b7c",
+ "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/0cba875ea1953435f78aec7f1d75afa87bdbf7f3",
+ "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3",
"shasum": ""
},
"require": {
- "php": "^7.4 || ^8.0",
- "symfony/polyfill-php80": "^1.26",
- "symfony/polyfill-php81": "^1.26",
+ "php": "^8.1",
"symfony/polyfill-php82": "^1.26"
},
"suggest": {
@@ -6149,27 +6276,27 @@
"issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
"source": "https://github.com/open-telemetry/opentelemetry-php"
},
- "time": "2024-01-13T05:50:44+00:00"
+ "time": "2024-08-21T00:29:20+00:00"
},
{
"name": "open-telemetry/exporter-otlp",
- "version": "1.0.4",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/opentelemetry-php/exporter-otlp.git",
- "reference": "342686bfce05867b56561a0af2fc8a4a8f27b3cc"
+ "reference": "9b6de12204f25f8ab9540b46d6e7b5151897ce18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/342686bfce05867b56561a0af2fc8a4a8f27b3cc",
- "reference": "342686bfce05867b56561a0af2fc8a4a8f27b3cc",
+ "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/9b6de12204f25f8ab9540b46d6e7b5151897ce18",
+ "reference": "9b6de12204f25f8ab9540b46d6e7b5151897ce18",
"shasum": ""
},
"require": {
"open-telemetry/api": "^1.0",
"open-telemetry/gen-otlp-protobuf": "^1.1",
"open-telemetry/sdk": "^1.0",
- "php": "^7.4 || ^8.0",
+ "php": "^8.1",
"php-http/discovery": "^1.14"
},
"type": "library",
@@ -6213,25 +6340,25 @@
"issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
"source": "https://github.com/open-telemetry/opentelemetry-php"
},
- "time": "2024-02-28T21:57:02+00:00"
+ "time": "2024-04-30T18:28:30+00:00"
},
{
"name": "open-telemetry/gen-otlp-protobuf",
- "version": "1.1.0",
+ "version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/opentelemetry-php/gen-otlp-protobuf.git",
- "reference": "76e2a44357f8c3fdcabcb070ec8a59e52ae3e3c3"
+ "reference": "66c3b98e998a726691c92e6405a82e6e7b8b169d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opentelemetry-php/gen-otlp-protobuf/zipball/76e2a44357f8c3fdcabcb070ec8a59e52ae3e3c3",
- "reference": "76e2a44357f8c3fdcabcb070ec8a59e52ae3e3c3",
+ "url": "https://api.github.com/repos/opentelemetry-php/gen-otlp-protobuf/zipball/66c3b98e998a726691c92e6405a82e6e7b8b169d",
+ "reference": "66c3b98e998a726691c92e6405a82e6e7b8b169d",
"shasum": ""
},
"require": {
- "google/protobuf": "^3.3.0",
- "php": "^7.4 || ^8.0"
+ "google/protobuf": "^3.22 || ^4.0",
+ "php": "^8.0"
},
"suggest": {
"ext-protobuf": "For better performance, when dealing with the protobuf format"
@@ -6276,47 +6403,54 @@
"issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
"source": "https://github.com/open-telemetry/opentelemetry-php"
},
- "time": "2024-01-16T21:54:57+00:00"
+ "time": "2024-10-30T11:49:49+00:00"
},
{
"name": "open-telemetry/sdk",
- "version": "1.0.8",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/opentelemetry-php/sdk.git",
- "reference": "1da4c0ca4f1a3c0fe84b81729dadec16f464fa77"
+ "reference": "fb0ff8d8279a3776bd604791e2531dd0cc147e8b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/1da4c0ca4f1a3c0fe84b81729dadec16f464fa77",
- "reference": "1da4c0ca4f1a3c0fe84b81729dadec16f464fa77",
+ "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/fb0ff8d8279a3776bd604791e2531dd0cc147e8b",
+ "reference": "fb0ff8d8279a3776bd604791e2531dd0cc147e8b",
"shasum": ""
},
"require": {
"ext-json": "*",
- "open-telemetry/api": "^1.0",
+ "nyholm/psr7-server": "^1.1",
+ "open-telemetry/api": "~1.0 || ~1.1",
"open-telemetry/context": "^1.0",
"open-telemetry/sem-conv": "^1.0",
- "php": "^7.4 || ^8.0",
+ "php": "^8.1",
"php-http/discovery": "^1.14",
"psr/http-client": "^1.0",
"psr/http-client-implementation": "^1.0",
"psr/http-factory-implementation": "^1.0",
"psr/http-message": "^1.0.1|^2.0",
"psr/log": "^1.1|^2.0|^3.0",
+ "ramsey/uuid": "^3.0 || ^4.0",
"symfony/polyfill-mbstring": "^1.23",
- "symfony/polyfill-php80": "^1.26",
- "symfony/polyfill-php81": "^1.26",
- "symfony/polyfill-php82": "^1.26"
+ "symfony/polyfill-php82": "^1.26",
+ "tbachert/spi": "^1.0.1"
},
"suggest": {
"ext-gmp": "To support unlimited number of synchronous metric readers",
- "ext-mbstring": "To increase performance of string operations"
+ "ext-mbstring": "To increase performance of string operations",
+ "open-telemetry/sdk-configuration": "File-based OpenTelemetry SDK configuration"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.0.x-dev"
+ },
+ "spi": {
+ "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\HookManagerInterface": [
+ "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\ExtensionHookManager"
+ ]
}
},
"autoload": {
@@ -6359,20 +6493,20 @@
"issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
"source": "https://github.com/open-telemetry/opentelemetry-php"
},
- "time": "2024-02-02T03:42:40+00:00"
+ "time": "2024-10-18T21:01:35+00:00"
},
{
"name": "open-telemetry/sem-conv",
- "version": "1.27.0",
+ "version": "1.27.1",
"source": {
"type": "git",
"url": "https://github.com/opentelemetry-php/sem-conv.git",
- "reference": "04685638c98df03419b6683aa1b2646877687c4b"
+ "reference": "1dba705fea74bc0718d04be26090e3697e56f4e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/04685638c98df03419b6683aa1b2646877687c4b",
- "reference": "04685638c98df03419b6683aa1b2646877687c4b",
+ "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/1dba705fea74bc0718d04be26090e3697e56f4e6",
+ "reference": "1dba705fea74bc0718d04be26090e3697e56f4e6",
"shasum": ""
},
"require": {
@@ -6416,7 +6550,7 @@
"issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
"source": "https://github.com/open-telemetry/opentelemetry-php"
},
- "time": "2024-08-06T15:17:39+00:00"
+ "time": "2024-08-28T09:20:31+00:00"
},
{
"name": "phar-io/manifest",
@@ -6538,16 +6672,16 @@
},
{
"name": "php-http/discovery",
- "version": "1.19.4",
+ "version": "1.20.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/discovery.git",
- "reference": "0700efda8d7526335132360167315fdab3aeb599"
+ "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-http/discovery/zipball/0700efda8d7526335132360167315fdab3aeb599",
- "reference": "0700efda8d7526335132360167315fdab3aeb599",
+ "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d",
+ "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d",
"shasum": ""
},
"require": {
@@ -6611,9 +6745,9 @@
],
"support": {
"issues": "https://github.com/php-http/discovery/issues",
- "source": "https://github.com/php-http/discovery/tree/1.19.4"
+ "source": "https://github.com/php-http/discovery/tree/1.20.0"
},
- "time": "2024-03-29T13:00:05+00:00"
+ "time": "2024-10-02T11:20:13+00:00"
},
{
"name": "php-http/guzzle7-adapter",
@@ -7752,6 +7886,187 @@
],
"time": "2024-09-19T10:52:21+00:00"
},
+ {
+ "name": "ramsey/collection",
+ "version": "2.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ramsey/collection.git",
+ "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+ "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^8.1"
+ },
+ "require-dev": {
+ "captainhook/plugin-composer": "^5.3",
+ "ergebnis/composer-normalize": "^2.28.3",
+ "fakerphp/faker": "^1.21",
+ "hamcrest/hamcrest-php": "^2.0",
+ "jangregor/phpstan-prophecy": "^1.0",
+ "mockery/mockery": "^1.5",
+ "php-parallel-lint/php-console-highlighter": "^1.0",
+ "php-parallel-lint/php-parallel-lint": "^1.3",
+ "phpcsstandards/phpcsutils": "^1.0.0-rc1",
+ "phpspec/prophecy-phpunit": "^2.0",
+ "phpstan/extension-installer": "^1.2",
+ "phpstan/phpstan": "^1.9",
+ "phpstan/phpstan-mockery": "^1.1",
+ "phpstan/phpstan-phpunit": "^1.3",
+ "phpunit/phpunit": "^9.5",
+ "psalm/plugin-mockery": "^1.1",
+ "psalm/plugin-phpunit": "^0.18.4",
+ "ramsey/coding-standard": "^2.0.3",
+ "ramsey/conventional-commits": "^1.3",
+ "vimeo/psalm": "^5.4"
+ },
+ "type": "library",
+ "extra": {
+ "captainhook": {
+ "force-install": true
+ },
+ "ramsey/conventional-commits": {
+ "configFile": "conventional-commits.json"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Ramsey\\Collection\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ben Ramsey",
+ "email": "ben@benramsey.com",
+ "homepage": "https://benramsey.com"
+ }
+ ],
+ "description": "A PHP library for representing and manipulating collections.",
+ "keywords": [
+ "array",
+ "collection",
+ "hash",
+ "map",
+ "queue",
+ "set"
+ ],
+ "support": {
+ "issues": "https://github.com/ramsey/collection/issues",
+ "source": "https://github.com/ramsey/collection/tree/2.0.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/ramsey",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-12-31T21:50:55+00:00"
+ },
+ {
+ "name": "ramsey/uuid",
+ "version": "4.7.6",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ramsey/uuid.git",
+ "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
+ "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
+ "shasum": ""
+ },
+ "require": {
+ "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
+ "ext-json": "*",
+ "php": "^8.0",
+ "ramsey/collection": "^1.2 || ^2.0"
+ },
+ "replace": {
+ "rhumsaa/uuid": "self.version"
+ },
+ "require-dev": {
+ "captainhook/captainhook": "^5.10",
+ "captainhook/plugin-composer": "^5.3",
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+ "doctrine/annotations": "^1.8",
+ "ergebnis/composer-normalize": "^2.15",
+ "mockery/mockery": "^1.3",
+ "paragonie/random-lib": "^2",
+ "php-mock/php-mock": "^2.2",
+ "php-mock/php-mock-mockery": "^1.3",
+ "php-parallel-lint/php-parallel-lint": "^1.1",
+ "phpbench/phpbench": "^1.0",
+ "phpstan/extension-installer": "^1.1",
+ "phpstan/phpstan": "^1.8",
+ "phpstan/phpstan-mockery": "^1.1",
+ "phpstan/phpstan-phpunit": "^1.1",
+ "phpunit/phpunit": "^8.5 || ^9",
+ "ramsey/composer-repl": "^1.4",
+ "slevomat/coding-standard": "^8.4",
+ "squizlabs/php_codesniffer": "^3.5",
+ "vimeo/psalm": "^4.9"
+ },
+ "suggest": {
+ "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
+ "ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.",
+ "ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.",
+ "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
+ "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
+ },
+ "type": "library",
+ "extra": {
+ "captainhook": {
+ "force-install": true
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/functions.php"
+ ],
+ "psr-4": {
+ "Ramsey\\Uuid\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "A PHP library for generating and working with universally unique identifiers (UUIDs).",
+ "keywords": [
+ "guid",
+ "identifier",
+ "uuid"
+ ],
+ "support": {
+ "issues": "https://github.com/ramsey/uuid/issues",
+ "source": "https://github.com/ramsey/uuid/tree/4.7.6"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/ramsey",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2024-04-27T21:32:50+00:00"
+ },
{
"name": "react/promise",
"version": "v3.2.0",
@@ -9328,6 +9643,58 @@
],
"time": "2024-10-25T15:34:29+00:00"
},
+ {
+ "name": "tbachert/spi",
+ "version": "v1.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Nevay/spi.git",
+ "reference": "2ddfaf815dafb45791a61b08170de8d583c16062"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Nevay/spi/zipball/2ddfaf815dafb45791a61b08170de8d583c16062",
+ "reference": "2ddfaf815dafb45791a61b08170de8d583c16062",
+ "shasum": ""
+ },
+ "require": {
+ "composer-plugin-api": "^2.0",
+ "composer/semver": "^1.0 || ^2.0 || ^3.0",
+ "php": "^8.1"
+ },
+ "require-dev": {
+ "composer/composer": "^2.0",
+ "infection/infection": "^0.27.9",
+ "phpunit/phpunit": "^10.5",
+ "psalm/phar": "^5.18"
+ },
+ "type": "composer-plugin",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "0.2.x-dev"
+ },
+ "class": "Nevay\\SPI\\Composer\\Plugin",
+ "plugin-optional": true
+ },
+ "autoload": {
+ "psr-4": {
+ "Nevay\\SPI\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "description": "Service provider loading facility",
+ "keywords": [
+ "service provider"
+ ],
+ "support": {
+ "issues": "https://github.com/Nevay/spi/issues",
+ "source": "https://github.com/Nevay/spi/tree/v1.0.2"
+ },
+ "time": "2024-10-04T16:36:12+00:00"
+ },
{
"name": "theseer/tokenizer",
"version": "1.2.3",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index 4d4761d34ada..c722a455787b 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -10,6 +10,7 @@
"drupal/core": "11.x-dev",
"behat/mink": "v1.12.0",
"behat/mink-browserkit-driver": "v2.2.0",
+ "brick/math": "0.12.1",
"colinodell/psr-testlogger": "v1.3.0",
"composer/ca-bundle": "1.5.2",
"composer/class-map-generator": "1.4.0",
@@ -21,7 +22,7 @@
"dealerdirect/phpcodesniffer-composer-installer": "v1.0.0",
"doctrine/instantiator": "2.0.0",
"drupal/coder": "8.3.24",
- "google/protobuf": "v3.25.4",
+ "google/protobuf": "v4.28.3",
"justinrainbow/json-schema": "5.3.0",
"lullabot/mink-selenium2-driver": "v1.7.3",
"lullabot/php-webdriver": "v2.0.5",
@@ -30,15 +31,16 @@
"mikey179/vfsstream": "v1.6.12",
"myclabs/deep-copy": "1.12.0",
"nikic/php-parser": "v5.1.0",
- "open-telemetry/api": "1.0.3",
- "open-telemetry/context": "1.0.2",
- "open-telemetry/exporter-otlp": "1.0.4",
- "open-telemetry/gen-otlp-protobuf": "1.1.0",
- "open-telemetry/sdk": "1.0.8",
- "open-telemetry/sem-conv": "1.27.0",
+ "nyholm/psr7-server": "1.1.0",
+ "open-telemetry/api": "1.1.1",
+ "open-telemetry/context": "1.1.0",
+ "open-telemetry/exporter-otlp": "1.1.0",
+ "open-telemetry/gen-otlp-protobuf": "1.2.1",
+ "open-telemetry/sdk": "1.1.2",
+ "open-telemetry/sem-conv": "1.27.1",
"phar-io/manifest": "2.0.4",
"phar-io/version": "3.2.1",
- "php-http/discovery": "1.19.4",
+ "php-http/discovery": "1.20.0",
"php-http/guzzle7-adapter": "1.0.0",
"php-http/httplug": "2.4.0",
"php-http/promise": "1.3.1",
@@ -58,6 +60,8 @@
"phpunit/php-text-template": "3.0.1",
"phpunit/php-timer": "6.0.0",
"phpunit/phpunit": "10.5.35",
+ "ramsey/collection": "2.0.0",
+ "ramsey/uuid": "4.7.6",
"react/promise": "v3.2.0",
"sebastian/cli-parser": "2.0.1",
"sebastian/code-unit": "2.0.0",
@@ -83,6 +87,7 @@
"symfony/css-selector": "v7.2.0-BETA1",
"symfony/dom-crawler": "v7.2.0-BETA1",
"symfony/lock": "v7.2.0-BETA1",
+ "tbachert/spi": "v1.0.2",
"theseer/tokenizer": "1.2.3",
"webflo/drupal-finder": "1.3.1",
"webmozart/assert": "1.11.0"
diff --git a/composer/Plugin/VendorHardening/Config.php b/composer/Plugin/VendorHardening/Config.php
index 411425b14f53..136729e9242e 100644
--- a/composer/Plugin/VendorHardening/Config.php
+++ b/composer/Plugin/VendorHardening/Config.php
@@ -77,6 +77,7 @@ class Config {
'symfony/var-dumper' => ['Tests'],
'symfony/validator' => ['Tests', 'Resources'],
'symfony/yaml' => ['Tests'],
+ 'tbachert/spi' => ['tests'],
'theseer/tokenizer' => ['tests'],
'twig/twig' => ['doc', 'ext', 'test', 'tests'],
];
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index ca266d4b37cd..92157f7dd359 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -388,6 +388,7 @@ nourriture
nplurals
nproc
ntfs
+nyholm
oembed
omittable
onecol
@@ -584,6 +585,7 @@ tablesorts
tabset
tabwidth
taskless
+tbachert
testbot
testbots
testgroups
--
GitLab