Skip to content

Commit f823b2b

Browse files
intuibaseSergeyKleyman
intuibase
and
SergeyKleyman
authored
Dependency shadowing/scoping (#47)
* Shadowing/scoping dependencies * Disabled dependency guard --------- Co-authored-by: Sergey Kleyman <SergeyKleyman@users.noreply.github.com>
1 parent 854fc1a commit f823b2b

File tree

98 files changed

+2200
-1246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+2200
-1246
lines changed

‎.github/workflows/build-php-deps.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ jobs:
3333
prod/php/vendor_*
3434
prod/php/OpenTelemetry/Distro/PhpPartVersion.php
3535
prod/php/OpenTelemetry/Distro/Log/LogFeature.php
36+
prod/php/ScoperConfig.php
3637
NOTICE

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated files
22
prod/php/OpenTelemetry/Distro/PhpPartVersion.php
33
prod/php/OpenTelemetry/Distro/Log/LogFeature.php
4+
prod/php/ScoperConfig.php
45

56
# Mac
67
.DS_Store
@@ -18,6 +19,7 @@ prod/php/OpenTelemetry/Distro/Log/LogFeature.php
1819
composer.lock
1920
composer.phar
2021
vendor/
22+
tests/vendor/
2123
prod/php/vendor_*/
2224

2325
# PHP_CodeSniffer

‎generated_composer_lock_files/dev_81.lock‎

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -145,23 +145,23 @@
145145
},
146146
{
147147
"name": "google/protobuf",
148-
"version": "v4.33.5",
148+
"version": "v4.33.6",
149149
"source": {
150150
"type": "git",
151151
"url": "https://github.com/protocolbuffers/protobuf-php.git",
152-
"reference": "ebe8010a61b2ae0cff0d246fe1c4d44e9f7dfa6d"
152+
"reference": "84b008c23915ed94536737eae46f41ba3bccfe67"
153153
},
154154
"dist": {
155155
"type": "zip",
156-
"url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/ebe8010a61b2ae0cff0d246fe1c4d44e9f7dfa6d",
157-
"reference": "ebe8010a61b2ae0cff0d246fe1c4d44e9f7dfa6d",
156+
"url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/84b008c23915ed94536737eae46f41ba3bccfe67",
157+
"reference": "84b008c23915ed94536737eae46f41ba3bccfe67",
158158
"shasum": ""
159159
},
160160
"require": {
161161
"php": ">=8.1.0"
162162
},
163163
"require-dev": {
164-
"phpunit/phpunit": ">=5.0.0 <8.5.27"
164+
"phpunit/phpunit": ">=10.5.62 <11.0.0"
165165
},
166166
"suggest": {
167167
"ext-bcmath": "Need to support JSON deserialization"
@@ -183,9 +183,9 @@
183183
"proto"
184184
],
185185
"support": {
186-
"source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.33.5"
186+
"source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.33.6"
187187
},
188-
"time": "2026-01-29T20:49:00+00:00"
188+
"time": "2026-03-18T17:32:05+00:00"
189189
},
190190
{
191191
"name": "guzzlehttp/guzzle",
@@ -398,16 +398,16 @@
398398
},
399399
{
400400
"name": "guzzlehttp/psr7",
401-
"version": "2.8.0",
401+
"version": "2.9.0",
402402
"source": {
403403
"type": "git",
404404
"url": "https://github.com/guzzle/psr7.git",
405-
"reference": "21dc724a0583619cd1652f673303492272778051"
405+
"reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884"
406406
},
407407
"dist": {
408408
"type": "zip",
409-
"url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
410-
"reference": "21dc724a0583619cd1652f673303492272778051",
409+
"url": "https://api.github.com/repos/guzzle/psr7/zipball/7d0ed42f28e42d61352a7a79de682e5e67fec884",
410+
"reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884",
411411
"shasum": ""
412412
},
413413
"require": {
@@ -423,6 +423,7 @@
423423
"require-dev": {
424424
"bamarni/composer-bin-plugin": "^1.8.2",
425425
"http-interop/http-factory-tests": "0.9.0",
426+
"jshttp/mime-db": "1.54.0.1",
426427
"phpunit/phpunit": "^8.5.44 || ^9.6.25"
427428
},
428429
"suggest": {
@@ -494,7 +495,7 @@
494495
],
495496
"support": {
496497
"issues": "https://github.com/guzzle/psr7/issues",
497-
"source": "https://github.com/guzzle/psr7/tree/2.8.0"
498+
"source": "https://github.com/guzzle/psr7/tree/2.9.0"
498499
},
499500
"funding": [
500501
{
@@ -510,7 +511,7 @@
510511
"type": "tidelift"
511512
}
512513
],
513-
"time": "2025-08-23T21:21:41+00:00"
514+
"time": "2026-03-10T16:41:02+00:00"
514515
},
515516
{
516517
"name": "nyholm/psr7-server",
@@ -650,16 +651,16 @@
650651
},
651652
{
652653
"name": "open-telemetry/context",
653-
"version": "1.4.0",
654+
"version": "1.5.0",
654655
"source": {
655656
"type": "git",
656657
"url": "https://github.com/opentelemetry-php/context.git",
657-
"reference": "d4c4470b541ce72000d18c339cfee633e4c8e0cf"
658+
"reference": "3c414b246e0dabb7d6145404e6a5e4536ca18d07"
658659
},
659660
"dist": {
660661
"type": "zip",
661-
"url": "https://api.github.com/repos/opentelemetry-php/context/zipball/d4c4470b541ce72000d18c339cfee633e4c8e0cf",
662-
"reference": "d4c4470b541ce72000d18c339cfee633e4c8e0cf",
662+
"url": "https://api.github.com/repos/opentelemetry-php/context/zipball/3c414b246e0dabb7d6145404e6a5e4536ca18d07",
663+
"reference": "3c414b246e0dabb7d6145404e6a5e4536ca18d07",
663664
"shasum": ""
664665
},
665666
"require": {
@@ -701,11 +702,11 @@
701702
],
702703
"support": {
703704
"chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V",
704-
"docs": "https://opentelemetry.io/docs/php",
705+
"docs": "https://opentelemetry.io/docs/languages/php",
705706
"issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
706707
"source": "https://github.com/open-telemetry/opentelemetry-php"
707708
},
708-
"time": "2025-09-19T00:05:49+00:00"
709+
"time": "2025-10-19T06:44:33+00:00"
709710
},
710711
{
711712
"name": "open-telemetry/exporter-otlp",
@@ -773,16 +774,16 @@
773774
},
774775
{
775776
"name": "open-telemetry/gen-otlp-protobuf",
776-
"version": "1.8.0",
777+
"version": "1.9.0",
777778
"source": {
778779
"type": "git",
779780
"url": "https://github.com/opentelemetry-php/gen-otlp-protobuf.git",
780-
"reference": "673af5b06545b513466081884b47ef15a536edde"
781+
"reference": "a229cf161d42001d64c8f21e8f678581fe1c66b9"
781782
},
782783
"dist": {
783784
"type": "zip",
784-
"url": "https://api.github.com/repos/opentelemetry-php/gen-otlp-protobuf/zipball/673af5b06545b513466081884b47ef15a536edde",
785-
"reference": "673af5b06545b513466081884b47ef15a536edde",
785+
"url": "https://api.github.com/repos/opentelemetry-php/gen-otlp-protobuf/zipball/a229cf161d42001d64c8f21e8f678581fe1c66b9",
786+
"reference": "a229cf161d42001d64c8f21e8f678581fe1c66b9",
786787
"shasum": ""
787788
},
788789
"require": {
@@ -828,11 +829,11 @@
828829
],
829830
"support": {
830831
"chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V",
831-
"docs": "https://opentelemetry.io/docs/php",
832+
"docs": "https://opentelemetry.io/docs/languages/php",
832833
"issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
833834
"source": "https://github.com/open-telemetry/opentelemetry-php"
834835
},
835-
"time": "2025-09-17T23:10:12+00:00"
836+
"time": "2025-10-19T06:44:33+00:00"
836837
},
837838
{
838839
"name": "open-telemetry/opentelemetry-auto-curl",
@@ -6156,16 +6157,16 @@
61566157
},
61576158
{
61586159
"name": "symfony/console",
6159-
"version": "v6.4.32",
6160+
"version": "v6.4.35",
61606161
"source": {
61616162
"type": "git",
61626163
"url": "https://github.com/symfony/console.git",
6163-
"reference": "0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3"
6164+
"reference": "49257c96304c508223815ee965c251e7c79e614e"
61646165
},
61656166
"dist": {
61666167
"type": "zip",
6167-
"url": "https://api.github.com/repos/symfony/console/zipball/0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3",
6168-
"reference": "0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3",
6168+
"url": "https://api.github.com/repos/symfony/console/zipball/49257c96304c508223815ee965c251e7c79e614e",
6169+
"reference": "49257c96304c508223815ee965c251e7c79e614e",
61696170
"shasum": ""
61706171
},
61716172
"require": {
@@ -6230,7 +6231,7 @@
62306231
"terminal"
62316232
],
62326233
"support": {
6233-
"source": "https://github.com/symfony/console/tree/v6.4.32"
6234+
"source": "https://github.com/symfony/console/tree/v6.4.35"
62346235
},
62356236
"funding": [
62366237
{
@@ -6250,20 +6251,20 @@
62506251
"type": "tidelift"
62516252
}
62526253
],
6253-
"time": "2026-01-13T08:45:59+00:00"
6254+
"time": "2026-03-06T13:31:08+00:00"
62546255
},
62556256
{
62566257
"name": "symfony/filesystem",
6257-
"version": "v6.4.30",
6258+
"version": "v6.4.34",
62586259
"source": {
62596260
"type": "git",
62606261
"url": "https://github.com/symfony/filesystem.git",
6261-
"reference": "441c6b69f7222aadae7cbf5df588496d5ee37789"
6262+
"reference": "01ffe0411b842f93c571e5c391f289c3fdd498c3"
62626263
},
62636264
"dist": {
62646265
"type": "zip",
6265-
"url": "https://api.github.com/repos/symfony/filesystem/zipball/441c6b69f7222aadae7cbf5df588496d5ee37789",
6266-
"reference": "441c6b69f7222aadae7cbf5df588496d5ee37789",
6266+
"url": "https://api.github.com/repos/symfony/filesystem/zipball/01ffe0411b842f93c571e5c391f289c3fdd498c3",
6267+
"reference": "01ffe0411b842f93c571e5c391f289c3fdd498c3",
62676268
"shasum": ""
62686269
},
62696270
"require": {
@@ -6300,7 +6301,7 @@
63006301
"description": "Provides basic utilities for the filesystem",
63016302
"homepage": "https://symfony.com",
63026303
"support": {
6303-
"source": "https://github.com/symfony/filesystem/tree/v6.4.30"
6304+
"source": "https://github.com/symfony/filesystem/tree/v6.4.34"
63046305
},
63056306
"funding": [
63066307
{
@@ -6320,20 +6321,20 @@
63206321
"type": "tidelift"
63216322
}
63226323
],
6323-
"time": "2025-11-26T14:43:45+00:00"
6324+
"time": "2026-02-24T17:51:06+00:00"
63246325
},
63256326
{
63266327
"name": "symfony/finder",
6327-
"version": "v6.4.33",
6328+
"version": "v6.4.34",
63286329
"source": {
63296330
"type": "git",
63306331
"url": "https://github.com/symfony/finder.git",
6331-
"reference": "24965ca011dac87431729640feef8bcf7b5523e0"
6332+
"reference": "9590e86be1d1c57bfbb16d0dd040345378c20896"
63326333
},
63336334
"dist": {
63346335
"type": "zip",
6335-
"url": "https://api.github.com/repos/symfony/finder/zipball/24965ca011dac87431729640feef8bcf7b5523e0",
6336-
"reference": "24965ca011dac87431729640feef8bcf7b5523e0",
6336+
"url": "https://api.github.com/repos/symfony/finder/zipball/9590e86be1d1c57bfbb16d0dd040345378c20896",
6337+
"reference": "9590e86be1d1c57bfbb16d0dd040345378c20896",
63376338
"shasum": ""
63386339
},
63396340
"require": {
@@ -6368,7 +6369,7 @@
63686369
"description": "Finds files and directories via an intuitive fluent interface",
63696370
"homepage": "https://symfony.com",
63706371
"support": {
6371-
"source": "https://github.com/symfony/finder/tree/v6.4.33"
6372+
"source": "https://github.com/symfony/finder/tree/v6.4.34"
63726373
},
63736374
"funding": [
63746375
{
@@ -6388,7 +6389,7 @@
63886389
"type": "tidelift"
63896390
}
63906391
],
6391-
"time": "2026-01-26T13:03:48+00:00"
6392+
"time": "2026-01-28T15:16:37+00:00"
63926393
},
63936394
{
63946395
"name": "symfony/polyfill-ctype",
@@ -7118,16 +7119,16 @@
71187119
},
71197120
{
71207121
"name": "symfony/string",
7121-
"version": "v6.4.30",
7122+
"version": "v6.4.34",
71227123
"source": {
71237124
"type": "git",
71247125
"url": "https://github.com/symfony/string.git",
7125-
"reference": "50590a057841fa6bf69d12eceffce3465b9e32cb"
7126+
"reference": "2adaf4106f2ef4c67271971bde6d3fe0a6936432"
71267127
},
71277128
"dist": {
71287129
"type": "zip",
7129-
"url": "https://api.github.com/repos/symfony/string/zipball/50590a057841fa6bf69d12eceffce3465b9e32cb",
7130-
"reference": "50590a057841fa6bf69d12eceffce3465b9e32cb",
7130+
"url": "https://api.github.com/repos/symfony/string/zipball/2adaf4106f2ef4c67271971bde6d3fe0a6936432",
7131+
"reference": "2adaf4106f2ef4c67271971bde6d3fe0a6936432",
71317132
"shasum": ""
71327133
},
71337134
"require": {
@@ -7183,7 +7184,7 @@
71837184
"utf8"
71847185
],
71857186
"support": {
7186-
"source": "https://github.com/symfony/string/tree/v6.4.30"
7187+
"source": "https://github.com/symfony/string/tree/v6.4.34"
71877188
},
71887189
"funding": [
71897190
{
@@ -7203,7 +7204,7 @@
72037204
"type": "tidelift"
72047205
}
72057206
],
7206-
"time": "2025-11-21T18:03:05+00:00"
7207+
"time": "2026-02-08T20:44:54+00:00"
72077208
},
72087209
{
72097210
"name": "theseer/tokenizer",

0 commit comments

Comments
 (0)