diff --git a/composer.json b/composer.json index 8fc3e4cba..b1e88d60f 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", diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 253b4b014..46e4a428a 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -264,11 +264,6 @@ - - - getDetails()]]> - - diff --git a/psalm.xml b/psalm.xml index 3e1d498a1..ef14c51ce 100644 --- a/psalm.xml +++ b/psalm.xml @@ -25,10 +25,5 @@ - - - - - diff --git a/src/Exception/Client/MultyOperation/OperationStatus.php b/src/Exception/Client/MultyOperation/OperationStatus.php index a87533a15..fea2e023e 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 783400f79..82449f4bb 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 0f25aab37..c5881dd76 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;