From b24c0d95dc4c57a11563b0be41aa8dd4785c7119 Mon Sep 17 00:00:00 2001 From: Dmitriy Derepko Date: Mon, 23 Mar 2026 20:05:49 +0400 Subject: [PATCH 1/2] feat: update dependency constraint for google/protobuf to support newer version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6aeef729..4942f1eb 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "ext-curl": "*", "ext-json": "*", "google/common-protos": "^4.9", - "google/protobuf": "^4.31.1", + "google/protobuf": "^4.31.1 || ^5.34.0", "grpc/grpc": "^1.57", "internal/destroy": "^1.0", "internal/promise": "^3.4", From 207deafc3f827991d23db2b20b4903ecdffd6fc5 Mon Sep 17 00:00:00 2001 From: Dmitriy Derepko Date: Mon, 23 Mar 2026 20:43:02 +0400 Subject: [PATCH 2/2] chore: replace `Google\Protobuf\Internal\RepeatedField` with `Google\Protobuf\RepeatedField` and update psalm configurations --- psalm-baseline.xml | 5 ----- psalm.xml | 5 ----- src/Exception/Client/MultyOperation/OperationStatus.php | 2 +- src/Exception/Client/UnpackDetailsTrait.php | 2 +- src/Internal/Marshaller/ProtoToArrayConverter.php | 2 +- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 10e3ad5f..60e5e8bb 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -336,11 +336,6 @@ - - - getDetails()]]> - - diff --git a/psalm.xml b/psalm.xml index 4bc82f15..42dc8dff 100644 --- a/psalm.xml +++ b/psalm.xml @@ -24,10 +24,5 @@ - - - - - diff --git a/src/Exception/Client/MultyOperation/OperationStatus.php b/src/Exception/Client/MultyOperation/OperationStatus.php index a87533a1..fea2e023 100644 --- a/src/Exception/Client/MultyOperation/OperationStatus.php +++ b/src/Exception/Client/MultyOperation/OperationStatus.php @@ -5,7 +5,7 @@ namespace Temporal\Exception\Client\MultyOperation; use Google\Protobuf\Any; -use Google\Protobuf\Internal\RepeatedField; +use Google\Protobuf\RepeatedField; use Temporal\Api\Errordetails\V1\MultiOperationExecutionFailure\OperationStatus as OperationStatusMessage; use Temporal\Exception\Client\UnpackDetailsTrait; diff --git a/src/Exception/Client/UnpackDetailsTrait.php b/src/Exception/Client/UnpackDetailsTrait.php index 783400f7..82449f4b 100644 --- a/src/Exception/Client/UnpackDetailsTrait.php +++ b/src/Exception/Client/UnpackDetailsTrait.php @@ -5,7 +5,7 @@ namespace Temporal\Exception\Client; use Google\Protobuf\Any; -use Google\Protobuf\Internal\RepeatedField; +use Google\Protobuf\RepeatedField; use GPBMetadata\Temporal\Api\Errordetails\V1\Message; /** diff --git a/src/Internal/Marshaller/ProtoToArrayConverter.php b/src/Internal/Marshaller/ProtoToArrayConverter.php index 0f25aab3..c5881dd7 100644 --- a/src/Internal/Marshaller/ProtoToArrayConverter.php +++ b/src/Internal/Marshaller/ProtoToArrayConverter.php @@ -8,7 +8,7 @@ use Google\Protobuf\Internal\MapField; use Google\Protobuf\Internal\Message; use Google\Protobuf\Internal\OneofField; -use Google\Protobuf\Internal\RepeatedField; +use Google\Protobuf\RepeatedField; use Google\Protobuf\Timestamp; use Temporal\Api\Common\V1\Header; use Temporal\Api\Common\V1\Memo;