Skip to content

Commit c743904

Browse files
committed
Merge pull request grpc#1162 from murgatroid99/php_add_protos
Replace generated code with proto files in PHP library
2 parents fe77f08 + 081cccc commit c743904

File tree

8 files changed

+327
-1630
lines changed

8 files changed

+327
-1630
lines changed

src/php/tests/generated_code/math.php

Lines changed: 0 additions & 479 deletions
This file was deleted.
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
2+
// Copyright 2015, Google Inc.
3+
// All rights reserved.
4+
//
5+
// Redistribution and use in source and binary forms, with or without
6+
// modification, are permitted provided that the following conditions are
7+
// met:
8+
//
9+
// * Redistributions of source code must retain the above copyright
10+
// notice, this list of conditions and the following disclaimer.
11+
// * Redistributions in binary form must reproduce the above
12+
// copyright notice, this list of conditions and the following disclaimer
13+
// in the documentation and/or other materials provided with the
14+
// distribution.
15+
// * Neither the name of Google Inc. nor the names of its
16+
// contributors may be used to endorse or promote products derived from
17+
// this software without specific prior written permission.
18+
//
19+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22+
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23+
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24+
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25+
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26+
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27+
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28+
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30+
31+
syntax = "proto3";
32+
33+
package math;
34+
35+
message DivArgs {
36+
optional int64 dividend = 1;
37+
optional int64 divisor = 2;
38+
}
39+
40+
message DivReply {
41+
optional int64 quotient = 1;
42+
optional int64 remainder = 2;
43+
}
44+
45+
message FibArgs {
46+
optional int64 limit = 1;
47+
}
48+
49+
message Num {
50+
optional int64 num = 1;
51+
}
52+
53+
message FibReply {
54+
optional int64 count = 1;
55+
}
56+
57+
service Math {
58+
// Div divides args.dividend by args.divisor and returns the quotient and
59+
// remainder.
60+
rpc Div (DivArgs) returns (DivReply) {
61+
}
62+
63+
// DivMany accepts an arbitrary number of division args from the client stream
64+
// and sends back the results in the reply stream. The stream continues until
65+
// the client closes its end; the server does the same after sending all the
66+
// replies. The stream ends immediately if either end aborts.
67+
rpc DivMany (stream DivArgs) returns (stream DivReply) {
68+
}
69+
70+
// Fib generates numbers in the Fibonacci sequence. If args.limit > 0, Fib
71+
// generates up to limit numbers; otherwise it continues until the call is
72+
// canceled. Unlike Fib above, Fib has no final FibReply.
73+
rpc Fib (FibArgs) returns (stream Num) {
74+
}
75+
76+
// Sum sums a stream of numbers, returning the final result once the stream
77+
// is closed.
78+
rpc Sum (stream Num) returns (Num) {
79+
}
80+
}

src/php/tests/interop/empty.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/php/tests/interop/empty.proto

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
2+
// Copyright 2015, Google Inc.
3+
// All rights reserved.
4+
//
5+
// Redistribution and use in source and binary forms, with or without
6+
// modification, are permitted provided that the following conditions are
7+
// met:
8+
//
9+
// * Redistributions of source code must retain the above copyright
10+
// notice, this list of conditions and the following disclaimer.
11+
// * Redistributions in binary form must reproduce the above
12+
// copyright notice, this list of conditions and the following disclaimer
13+
// in the documentation and/or other materials provided with the
14+
// distribution.
15+
// * Neither the name of Google Inc. nor the names of its
16+
// contributors may be used to endorse or promote products derived from
17+
// this software without specific prior written permission.
18+
//
19+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22+
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23+
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24+
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25+
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26+
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27+
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28+
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30+
31+
syntax = "proto2";
32+
33+
package grpc.testing;
34+
35+
// An empty message that you can re-use to avoid defining duplicated empty
36+
// messages in your project. A typical example is to use it as argument or the
37+
// return value of a service API. For instance:
38+
//
39+
// service Foo {
40+
// rpc Bar (grpc.testing.EmptyMessage) returns (grpc.testing.EmptyMessage) { };
41+
// };
42+
//
43+
message EmptyMessage {}

0 commit comments

Comments
 (0)