From aa5d2b3be94b1cb53cb52c309dfa317fdc62a7ed Mon Sep 17 00:00:00 2001 From: Sergey Kleyman Date: Wed, 25 Jun 2025 15:46:17 +0300 Subject: [PATCH 1/6] "dealerdirect/phpcodesniffer-composer-installer": "1.0.0" Pinned "dealerdirect/phpcodesniffer-composer-installer" version to "1.0.0" to fix the error "The provided cwd "../squizlabs/php_codesniffer" does not exist." --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 2eb6fff8..c78fcf42 100644 --- a/composer.json +++ b/composer.json @@ -26,6 +26,7 @@ "slim/slim": "*" }, "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "1.0.0", "google/protobuf": "4.30.2", "ext-ctype": "*", "ext-curl": "*", From 17f3c3bb831bea3cd2544c26203b684bd3c8fe99 Mon Sep 17 00:00:00 2001 From: Sergey Kleyman Date: Wed, 25 Jun 2025 16:23:05 +0300 Subject: [PATCH 2/6] Updated dev packages --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 8d3cf3fa..76ff599c 100644 --- a/composer.json +++ b/composer.json @@ -32,17 +32,17 @@ "ext-mysqli": "*", "ext-pdo": "*", "ext-zlib": "*", - "guzzlehttp/guzzle": "^7.9.2", - "nikic/php-parser": "^5.4.0", - "php-ds/php-ds": "^1.5.0", + "guzzlehttp/guzzle": "^7.9.3", + "nikic/php-parser": "^5.5.0", + "php-ds/php-ds": "^1.7.0", "php-parallel-lint/php-console-highlighter": "^1.0", "php-parallel-lint/php-parallel-lint": "1.4.0", - "phpstan/phpstan": "2.1.3", + "phpstan/phpstan": "2.1.17", "phpstan/phpstan-phpunit": "^2.0", - "phpunit/phpunit": "^10.5.45", - "react/http": "^1.6", - "slevomat/coding-standard": "8.15.0", - "squizlabs/php_codesniffer": "3.11.3" + "phpunit/phpunit": "^10.5.47", + "react/http": "^1.11", + "slevomat/coding-standard": "8.19.1", + "squizlabs/php_codesniffer": "3.13.2" }, "autoload-dev": { "psr-4": { From 363355fa32a0491530fcdcc6ed3924344054cdd9 Mon Sep 17 00:00:00 2001 From: Sergey Kleyman Date: Wed, 25 Jun 2025 16:30:46 +0300 Subject: [PATCH 3/6] Updated OTel packages --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 76ff599c..32cd4ca3 100644 --- a/composer.json +++ b/composer.json @@ -10,14 +10,14 @@ ], "require": { "php": "8.1.*||8.2.*||8.3.*||8.4.*", - "open-telemetry/exporter-otlp": "1.2.1", - "open-telemetry/opentelemetry-auto-curl": "0.0.3", - "open-telemetry/opentelemetry-auto-http-async": "1.1.0", - "open-telemetry/opentelemetry-auto-laravel": "1.1.0", - "open-telemetry/opentelemetry-auto-mysqli": "0.0.2", - "open-telemetry/opentelemetry-auto-pdo": "0.0.18", - "open-telemetry/opentelemetry-auto-slim": "1.1.0", - "open-telemetry/sdk": "1.1.2", + "open-telemetry/exporter-otlp": "1.3.2", + "open-telemetry/opentelemetry-auto-curl": "0.0.5", + "open-telemetry/opentelemetry-auto-http-async": "1.1.1", + "open-telemetry/opentelemetry-auto-laravel": "1.2.2", + "open-telemetry/opentelemetry-auto-mysqli": "0.0.3", + "open-telemetry/opentelemetry-auto-pdo": "0.1.1", + "open-telemetry/opentelemetry-auto-slim": "1.1.1", + "open-telemetry/sdk": "1.6.0", "php-http/guzzle7-adapter": "^1.0", "nyholm/psr7-server": "^1.1" }, From 9a2cd42109f2841d395f78f682ce9e37e88efbd5 Mon Sep 17 00:00:00 2001 From: Sergey Kleyman Date: Wed, 25 Jun 2025 16:44:53 +0300 Subject: [PATCH 4/6] Fixed issues found by PHPStan --- .../ElasticOTelTests/UnitTests/UtilTests/DebugContextTest.php | 2 +- tests/ElasticOTelTests/Util/ListSlice.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ElasticOTelTests/UnitTests/UtilTests/DebugContextTest.php b/tests/ElasticOTelTests/UnitTests/UtilTests/DebugContextTest.php index c83f1b56..22dbc775 100644 --- a/tests/ElasticOTelTests/UnitTests/UtilTests/DebugContextTest.php +++ b/tests/ElasticOTelTests/UnitTests/UtilTests/DebugContextTest.php @@ -1031,7 +1031,7 @@ public function testTrimVendorFrames(MixedMap $testArgs): void } $dbgCtx->add(compact('assertionMsg')); self::assertNotNull($assertionMsg); - self::assertNotNull($testFuncLine); + self::assertNotNull($testFuncLine); // @phpstan-ignore staticMethod.alreadyNarrowedType self::assertSame($nonVendorCallsDepth, $actualNonVendorCallDepth); $addedText = DebugContext::extractAddedTextFromMessage($assertionMsg); diff --git a/tests/ElasticOTelTests/Util/ListSlice.php b/tests/ElasticOTelTests/Util/ListSlice.php index 0378f396..31f4eb14 100644 --- a/tests/ElasticOTelTests/Util/ListSlice.php +++ b/tests/ElasticOTelTests/Util/ListSlice.php @@ -77,7 +77,7 @@ public function __construct(array $base, int $offset = 0, ?int $length = null) #[Override] public function count(): int { - return $this->length; + return $this->length; // @phpstan-ignore return.type } #[Override] @@ -93,7 +93,7 @@ public function getIterator(): Traversable */ public function clone(): self { - return new self($this->base, $this->offset, $this->length); + return new self($this->base, $this->offset, $this->length); // @phpstan-ignore argument.type } /** From 22cf42bf990566454d4bcdba490608bab13eaeba Mon Sep 17 00:00:00 2001 From: Sergey Kleyman Date: Wed, 25 Jun 2025 17:22:13 +0300 Subject: [PATCH 5/6] Reverted open-telemetry/exporter-otlp back to 1.2.1 It needs changes to native exporter implementation so we will do it in a separate PR --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 32cd4ca3..a1cb677c 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ ], "require": { "php": "8.1.*||8.2.*||8.3.*||8.4.*", - "open-telemetry/exporter-otlp": "1.3.2", + "open-telemetry/exporter-otlp": "1.2.1", "open-telemetry/opentelemetry-auto-curl": "0.0.5", "open-telemetry/opentelemetry-auto-http-async": "1.1.1", "open-telemetry/opentelemetry-auto-laravel": "1.2.2", From 740bac13c684221ee8e7b9371680209afa952c20 Mon Sep 17 00:00:00 2001 From: Sergey Kleyman Date: Wed, 25 Jun 2025 17:23:34 +0300 Subject: [PATCH 6/6] Updated "open-telemetry/exporter-otlp" to "1.3.2" --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a1cb677c..32cd4ca3 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ ], "require": { "php": "8.1.*||8.2.*||8.3.*||8.4.*", - "open-telemetry/exporter-otlp": "1.2.1", + "open-telemetry/exporter-otlp": "1.3.2", "open-telemetry/opentelemetry-auto-curl": "0.0.5", "open-telemetry/opentelemetry-auto-http-async": "1.1.1", "open-telemetry/opentelemetry-auto-laravel": "1.2.2",