Skip to content

Move to protoc-plugin/0.6.0 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kafkiansky merged 1 commit into from
Sep 27, 2026
Merged

Move to protoc-plugin/0.6.0 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COMPOSER ?= $(RUN) composer
t: terminal
terminal: var ## Start a terminal inside the php container
@$(if $(INSIDE_CONTAINER),echo 'Already inside docker container.'; exit 1,)
$(DOCKER_COMPOSE) run --rm $(ARGS) php bash
$(DOCKER_COMPOSE) run --rm $(ARGS) php sh
.PHONY: t terminal

run: ## Run a command using the php container: `make run CMD='php --version'`
Expand Down
10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
"psr/log": "^3.0",
"revolt/event-loop": "^1.0.8",
"thesis/endian": "^0.3.3",
"thesis/googleapis-rpc-types": "^0.2",
"thesis/googleapis-rpc-types": "^0.3",
"thesis/package-version": "^0.1.2",
"thesis/protobuf": "^0.2",
"thesis/protobuf-known-types": "^0.2"
"thesis/protobuf-known-types": "^0.3.1"
},
"require-dev": {
"ext-bcmath": "*",
Expand All @@ -55,9 +55,9 @@
"options": {
"symlink": true,
"versions": {
"thesis/grpc-client": "0.2.x-dev",
"thesis/grpc-protocol": "0.2.x-dev",
"thesis/grpc-server": "0.2.x-dev"
"thesis/grpc-client": "0.3.x-dev",
"thesis/grpc-protocol": "0.3.x-dev",
"thesis/grpc-server": "0.3.x-dev"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/client/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"amphp/http-client": "^5.3",
"amphp/socket": "^2.3",
"league/uri": "^7.8",
"thesis/grpc-protocol": "^0.2"
"thesis/grpc-protocol": "^0.3"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/Client/Internal/AmphpHttpClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use Amp\Cancellation;
use Amp\NullCancellation;
use Google\Rpc\Code;
use Thesis\Google\Rpc\Code;
use Thesis\Grpc\Client;
use Thesis\Grpc\Client\PickContext;
use Thesis\Grpc\ClientStream;
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/Client/Internal/Http2/ConcurrentClientStream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Amp\Http\Client\Response;
use Amp\NullCancellation;
use Amp\Pipeline;
use Google\Rpc\Code;
use Thesis\Google\Rpc\Code;
use Thesis\Grpc\ClientStream;
use Thesis\Grpc\Exception\ClientStreamIsClosed;
use Thesis\Grpc\InvokeError;
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/Client/Internal/Http2/ErrorHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Thesis\Grpc\Client\Internal\Http2;

use Google\Rpc;
use Thesis\Google\Rpc;
use Thesis\Grpc\ClientStream;
use Thesis\Grpc\InvokeError;
use Thesis\Grpc\Status;
Expand Down
4 changes: 2 additions & 2 deletions packages/grpc/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"amphp/pipeline": "^1.2",
"revolt/event-loop": "^1.0.8",
"thesis/endian": "^0.3.3",
"thesis/googleapis-rpc-types": "^0.2",
"thesis/googleapis-rpc-types": "^0.3",
"thesis/package-version": "^0.1.2",
"thesis/protobuf": "^0.2",
"thesis/protobuf-known-types": "^0.2"
"thesis/protobuf-known-types": "^0.3.1"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc/src/InvokeError.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Thesis\Grpc;

use Google\Rpc\Code;
use Thesis\Google\Rpc\Code;

/**
* @api
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc/src/Metadata/Status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Thesis\Grpc\Metadata;

use Google\Rpc;
use Thesis\Google\Rpc;
use Thesis\Grpc\Metadata;

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/grpc/src/Status/Context.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace Thesis\Grpc\Status;

use Google\Protobuf;
use Google\Rpc;
use Thesis\Google\Protobuf;
use Thesis\Google\Rpc;
use Thesis\Grpc\Metadata;
use Thesis\Protobuf\Decoder;
use Thesis\Protobuf\Encoder;
Expand Down
2 changes: 1 addition & 1 deletion packages/server/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"amphp/socket": "^2.3",
"amphp/sync": "^2.3",
"psr/log": "^3.0",
"thesis/grpc-protocol": "^0.2"
"thesis/grpc-protocol": "^0.3"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/Server/Internal/Http2/ServerRequestHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use Amp\Http\Server\Response;
use Amp\Http\Server\Trailers;
use Amp\TimeoutCancellation;
use Google\Rpc;
use Thesis\Google\Rpc;
use Thesis\Grpc\Metadata;
use Thesis\Grpc\Server\Internal\StreamHandleInterceptor;
use Thesis\Grpc\Server\Internal\StreamInterceptorComposer;
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/Server/Internal/StreamHandleInterceptor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use Amp\Cancellation;
use Amp\CancelledException;
use Google\Rpc;
use Thesis\Google\Rpc;
use Thesis\Grpc\InvokeError;
use Thesis\Grpc\Metadata;
use Thesis\Grpc\Server\StreamInfo;
Expand Down
4 changes: 2 additions & 2 deletions tests/ServerStreamTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
namespace Thesis\Grpc;

use Amp\Cancellation;
use Google\Protobuf\Timestamp;
use Google\Rpc\Code;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\TestCase;
use Thesis\Google\Protobuf\Timestamp;
use Thesis\Google\Rpc\Code;
use Thesis\Grpc\Client\Internal\AmphpHttpClient;
use Thesis\Grpc\Server\Internal\AmphpHttpServer;
use Thesis\Grpc\Server\ServerStreamHandler;
Expand Down
2 changes: 1 addition & 1 deletion tests/Status/ContextTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

namespace Thesis\Grpc\Status;

use Google\Rpc;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\CoversFunction;
use PHPUnit\Framework\Attributes\TestWith;
use PHPUnit\Framework\TestCase;
use Thesis\Google\Rpc;
use Thesis\Grpc\Metadata;
use Thesis\Protobuf\Decoder;
use Thesis\Protobuf\Encoder;
Expand Down
2 changes: 1 addition & 1 deletion tests/Stub/AuthorizationServerInterceptor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace Thesis\Grpc\Stub;

use Amp\Cancellation;
use Google\Rpc\Code;
use Thesis\Google\Rpc\Code;
use Thesis\Grpc\InvokeError;
use Thesis\Grpc\Metadata;
use Thesis\Grpc\Server\StreamInfo;
Expand Down
4 changes: 2 additions & 2 deletions tests/UnaryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
use Echos\Api\V1\EchoServiceClient;
use Echos\Api\V1\EchoServiceServer;
use Echos\Api\V1\EchoServiceServerRegistry;
use Google\Rpc\BadRequest;
use Google\Rpc\Code;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\TestCase;
use Thesis\Google\Rpc\BadRequest;
use Thesis\Google\Rpc\Code;
use Thesis\Grpc\Client\Internal\AmphpHttpClient;
use Thesis\Grpc\Client\Invoke;
use Thesis\Grpc\Server\Internal\AmphpHttpServer;
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Chat/Api/V1/DescriptorRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/chat_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Chat/Api/V1/Message.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/chat_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Chat/Api/V1/MessengerServiceClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/chat_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Chat/Api/V1/MessengerServiceServer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/chat_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Chat/Api/V1/MessengerServiceServerRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/chat_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Chat/Api/V1/autoload.metadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Echos/Api/V1/DescriptorRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/echo_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Echos/Api/V1/EchoRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/echo_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Echos/Api/V1/EchoResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/echo_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Echos/Api/V1/EchoServiceClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/echo_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Echos/Api/V1/EchoServiceServer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/echo_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Echos/Api/V1/EchoServiceServerRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/echo_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Echos/Api/V1/autoload.metadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/File/Api/V1/Chunk.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/file_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/File/Api/V1/DescriptorRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/file_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/File/Api/V1/FileInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/file_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/File/Api/V1/FileServiceClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/file_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/File/Api/V1/FileServiceServer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/file_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/File/Api/V1/FileServiceServerRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/file_v1.proto
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/File/Api/V1/autoload.metadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/genproto/Topic/Api/V1/DescriptorRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/topic_v1.proto
*/
Expand Down
6 changes: 3 additions & 3 deletions tests/genproto/Topic/Api/V1/Event.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Code generated by thesis/protoc-plugin. DO NOT EDIT.
* Versions:
* thesis/protoc-plugin — v0.5.1
* thesis/protoc-plugin — v0.6.1
* protoc — v6.33.5
* Source: tests/protos/topic_v1.proto
*/
Expand All @@ -24,7 +24,7 @@ public function __construct(
public string $type = '',
#[Reflection\Field(2, Reflection\StringT::T)]
public string $payload = '',
#[Reflection\Field(3, new Reflection\ObjectT(\Google\Protobuf\Timestamp::class))]
public ?\Google\Protobuf\Timestamp $ts = null,
#[Reflection\Field(3, new Reflection\ObjectT(\Thesis\Google\Protobuf\Timestamp::class))]
public ?\Thesis\Google\Protobuf\Timestamp $ts = null,
) {}
}
Loading
Loading