Browse Source

Updated generated code to match protos

murgatroid99 10 years ago
parent
commit
65dda6ca31

+ 54 - 52
src/php/tests/generated_code/math.php

@@ -1,7 +1,7 @@
 <?php
 // DO NOT EDIT! Generated by Protobuf-PHP protoc plugin 1.0
 // Source: math.proto
-//   Date: 2014-11-14 00:00:41
+//   Date: 2015-04-01 01:00:50
 
 namespace math {
 
@@ -9,10 +9,10 @@ namespace math {
 
     /**  @var int */
     public $dividend = null;
-
+    
     /**  @var int */
     public $divisor = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -21,20 +21,20 @@ namespace math {
     {
       $descriptor = new \DrSlump\Protobuf\Descriptor(__CLASS__, 'math.DivArgs');
 
-      // REQUIRED INT64 dividend = 1
+      // OPTIONAL INT64 dividend = 1
       $f = new \DrSlump\Protobuf\Field();
       $f->number    = 1;
       $f->name      = "dividend";
       $f->type      = \DrSlump\Protobuf::TYPE_INT64;
-      $f->rule      = \DrSlump\Protobuf::RULE_REQUIRED;
+      $f->rule      = \DrSlump\Protobuf::RULE_OPTIONAL;
       $descriptor->addField($f);
 
-      // REQUIRED INT64 divisor = 2
+      // OPTIONAL INT64 divisor = 2
       $f = new \DrSlump\Protobuf\Field();
       $f->number    = 2;
       $f->name      = "divisor";
       $f->type      = \DrSlump\Protobuf::TYPE_INT64;
-      $f->rule      = \DrSlump\Protobuf::RULE_REQUIRED;
+      $f->rule      = \DrSlump\Protobuf::RULE_OPTIONAL;
       $descriptor->addField($f);
 
       foreach (self::$__extensions as $cb) {
@@ -52,7 +52,7 @@ namespace math {
     public function hasDividend(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <dividend> value
      *
@@ -61,7 +61,7 @@ namespace math {
     public function clearDividend(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <dividend> value
      *
@@ -70,7 +70,7 @@ namespace math {
     public function getDividend(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <dividend> value
      *
@@ -80,7 +80,7 @@ namespace math {
     public function setDividend( $value){
       return $this->_set(1, $value);
     }
-
+    
     /**
      * Check if <divisor> has a value
      *
@@ -89,7 +89,7 @@ namespace math {
     public function hasDivisor(){
       return $this->_has(2);
     }
-
+    
     /**
      * Clear <divisor> value
      *
@@ -98,7 +98,7 @@ namespace math {
     public function clearDivisor(){
       return $this->_clear(2);
     }
-
+    
     /**
      * Get <divisor> value
      *
@@ -107,7 +107,7 @@ namespace math {
     public function getDivisor(){
       return $this->_get(2);
     }
-
+    
     /**
      * Set <divisor> value
      *
@@ -126,10 +126,10 @@ namespace math {
 
     /**  @var int */
     public $quotient = null;
-
+    
     /**  @var int */
     public $remainder = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -138,20 +138,20 @@ namespace math {
     {
       $descriptor = new \DrSlump\Protobuf\Descriptor(__CLASS__, 'math.DivReply');
 
-      // REQUIRED INT64 quotient = 1
+      // OPTIONAL INT64 quotient = 1
       $f = new \DrSlump\Protobuf\Field();
       $f->number    = 1;
       $f->name      = "quotient";
       $f->type      = \DrSlump\Protobuf::TYPE_INT64;
-      $f->rule      = \DrSlump\Protobuf::RULE_REQUIRED;
+      $f->rule      = \DrSlump\Protobuf::RULE_OPTIONAL;
       $descriptor->addField($f);
 
-      // REQUIRED INT64 remainder = 2
+      // OPTIONAL INT64 remainder = 2
       $f = new \DrSlump\Protobuf\Field();
       $f->number    = 2;
       $f->name      = "remainder";
       $f->type      = \DrSlump\Protobuf::TYPE_INT64;
-      $f->rule      = \DrSlump\Protobuf::RULE_REQUIRED;
+      $f->rule      = \DrSlump\Protobuf::RULE_OPTIONAL;
       $descriptor->addField($f);
 
       foreach (self::$__extensions as $cb) {
@@ -169,7 +169,7 @@ namespace math {
     public function hasQuotient(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <quotient> value
      *
@@ -178,7 +178,7 @@ namespace math {
     public function clearQuotient(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <quotient> value
      *
@@ -187,7 +187,7 @@ namespace math {
     public function getQuotient(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <quotient> value
      *
@@ -197,7 +197,7 @@ namespace math {
     public function setQuotient( $value){
       return $this->_set(1, $value);
     }
-
+    
     /**
      * Check if <remainder> has a value
      *
@@ -206,7 +206,7 @@ namespace math {
     public function hasRemainder(){
       return $this->_has(2);
     }
-
+    
     /**
      * Clear <remainder> value
      *
@@ -215,7 +215,7 @@ namespace math {
     public function clearRemainder(){
       return $this->_clear(2);
     }
-
+    
     /**
      * Get <remainder> value
      *
@@ -224,7 +224,7 @@ namespace math {
     public function getRemainder(){
       return $this->_get(2);
     }
-
+    
     /**
      * Set <remainder> value
      *
@@ -243,7 +243,7 @@ namespace math {
 
     /**  @var int */
     public $limit = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -275,7 +275,7 @@ namespace math {
     public function hasLimit(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <limit> value
      *
@@ -284,7 +284,7 @@ namespace math {
     public function clearLimit(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <limit> value
      *
@@ -293,7 +293,7 @@ namespace math {
     public function getLimit(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <limit> value
      *
@@ -312,7 +312,7 @@ namespace math {
 
     /**  @var int */
     public $num = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -321,12 +321,12 @@ namespace math {
     {
       $descriptor = new \DrSlump\Protobuf\Descriptor(__CLASS__, 'math.Num');
 
-      // REQUIRED INT64 num = 1
+      // OPTIONAL INT64 num = 1
       $f = new \DrSlump\Protobuf\Field();
       $f->number    = 1;
       $f->name      = "num";
       $f->type      = \DrSlump\Protobuf::TYPE_INT64;
-      $f->rule      = \DrSlump\Protobuf::RULE_REQUIRED;
+      $f->rule      = \DrSlump\Protobuf::RULE_OPTIONAL;
       $descriptor->addField($f);
 
       foreach (self::$__extensions as $cb) {
@@ -344,7 +344,7 @@ namespace math {
     public function hasNum(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <num> value
      *
@@ -353,7 +353,7 @@ namespace math {
     public function clearNum(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <num> value
      *
@@ -362,7 +362,7 @@ namespace math {
     public function getNum(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <num> value
      *
@@ -381,7 +381,7 @@ namespace math {
 
     /**  @var int */
     public $count = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -390,12 +390,12 @@ namespace math {
     {
       $descriptor = new \DrSlump\Protobuf\Descriptor(__CLASS__, 'math.FibReply');
 
-      // REQUIRED INT64 count = 1
+      // OPTIONAL INT64 count = 1
       $f = new \DrSlump\Protobuf\Field();
       $f->number    = 1;
       $f->name      = "count";
       $f->type      = \DrSlump\Protobuf::TYPE_INT64;
-      $f->rule      = \DrSlump\Protobuf::RULE_REQUIRED;
+      $f->rule      = \DrSlump\Protobuf::RULE_OPTIONAL;
       $descriptor->addField($f);
 
       foreach (self::$__extensions as $cb) {
@@ -413,7 +413,7 @@ namespace math {
     public function hasCount(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <count> value
      *
@@ -422,7 +422,7 @@ namespace math {
     public function clearCount(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <count> value
      *
@@ -431,7 +431,7 @@ namespace math {
     public function getCount(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <count> value
      *
@@ -446,34 +446,36 @@ namespace math {
 
 namespace math {
 
-  class MathClient extends \Grpc\BaseStub {
+  class MathClient{
+
+    private $rpc_impl;
+
+    public function __construct($rpc_impl) {
+      $this->rpc_impl = $rpc_impl;
+    }
     /**
      * @param math\DivArgs $input
-     * @return math\DivReply
      */
     public function Div(\math\DivArgs $argument, $metadata = array()) {
-      return $this->_simpleRequest('/Math/Div', $argument, '\math\DivReply::deserialize', $metadata);
+      return $this->rpc_impl->_simpleRequest('/math.Math/Div', $argument, '\math\DivReply::deserialize', $metadata);
     }
     /**
      * @param math\DivArgs $input
-     * @return math\DivReply
      */
     public function DivMany($metadata = array()) {
-      return $this->_bidiRequest('/Math/DivMany', '\math\DivReply::deserialize', $metadata);
+      return $this->rpc_impl->_bidiRequest('/math.Math/DivMany', '\math\DivReply::deserialize', $metadata);
     }
     /**
      * @param math\FibArgs $input
-     * @return math\Num
      */
     public function Fib($argument, $metadata = array()) {
-      return $this->_serverStreamRequest('/Math/Fib', $argument, '\math\Num::deserialize', $metadata);
+      return $this->rpc_impl->_serverStreamRequest('/math.Math/Fib', $argument, '\math\Num::deserialize', $metadata);
     }
     /**
      * @param math\Num $input
-     * @return math\Num
      */
     public function Sum($arguments, $metadata = array()) {
-      return $this->_clientStreamRequest('/Math/Sum', $arguments, '\math\Num::deserialize', $metadata);
+      return $this->rpc_impl->_clientStreamRequest('/math.Math/Sum', $arguments, '\math\Num::deserialize', $metadata);
     }
   }
 }

+ 3 - 2
src/php/tests/interop/empty.php

@@ -1,7 +1,7 @@
 <?php
 // DO NOT EDIT! Generated by Protobuf-PHP protoc plugin 1.0
-// Source: test/cpp/interop/empty.proto
-//   Date: 2015-01-30 23:30:46
+// Source: empty.proto
+//   Date: 2015-04-01 00:58:16
 
 namespace grpc\testing {
 
@@ -23,3 +23,4 @@ namespace grpc\testing {
     }
   }
 }
+

+ 2 - 2
src/php/tests/interop/empty.proto

@@ -37,7 +37,7 @@ package grpc.testing;
 // return value of a service API. For instance:
 //
 //   service Foo {
-//     rpc Bar (grpc.testing.Empty) returns (grpc.testing.Empty) { };
+//     rpc Bar (grpc.testing.EmptyMessage) returns (grpc.testing.EmptyMessage) { };
 //   };
 //
-message Empty {}
+message EmptyMessage {}

+ 92 - 89
src/php/tests/interop/messages.php

@@ -1,7 +1,7 @@
 <?php
 // DO NOT EDIT! Generated by Protobuf-PHP protoc plugin 1.0
-// Source: test/cpp/interop/messages.proto
-//   Date: 2015-01-30 23:30:46
+// Source: messages.proto
+//   Date: 2015-04-01 00:58:16
 
 namespace grpc\testing {
 
@@ -16,11 +16,11 @@ namespace grpc\testing {
   class Payload extends \DrSlump\Protobuf\Message {
 
     /**  @var int - \grpc\testing\PayloadType */
-    public $type = null;
-
+    public $type = \grpc\testing\PayloadType::COMPRESSABLE;
+    
     /**  @var string */
     public $body = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -36,6 +36,7 @@ namespace grpc\testing {
       $f->type      = \DrSlump\Protobuf::TYPE_ENUM;
       $f->rule      = \DrSlump\Protobuf::RULE_OPTIONAL;
       $f->reference = '\grpc\testing\PayloadType';
+      $f->default   = \grpc\testing\PayloadType::COMPRESSABLE;
       $descriptor->addField($f);
 
       // OPTIONAL BYTES body = 2
@@ -61,7 +62,7 @@ namespace grpc\testing {
     public function hasType(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <type> value
      *
@@ -70,7 +71,7 @@ namespace grpc\testing {
     public function clearType(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <type> value
      *
@@ -79,7 +80,7 @@ namespace grpc\testing {
     public function getType(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <type> value
      *
@@ -89,7 +90,7 @@ namespace grpc\testing {
     public function setType( $value){
       return $this->_set(1, $value);
     }
-
+    
     /**
      * Check if <body> has a value
      *
@@ -98,7 +99,7 @@ namespace grpc\testing {
     public function hasBody(){
       return $this->_has(2);
     }
-
+    
     /**
      * Clear <body> value
      *
@@ -107,7 +108,7 @@ namespace grpc\testing {
     public function clearBody(){
       return $this->_clear(2);
     }
-
+    
     /**
      * Get <body> value
      *
@@ -116,7 +117,7 @@ namespace grpc\testing {
     public function getBody(){
       return $this->_get(2);
     }
-
+    
     /**
      * Set <body> value
      *
@@ -134,20 +135,20 @@ namespace grpc\testing {
   class SimpleRequest extends \DrSlump\Protobuf\Message {
 
     /**  @var int - \grpc\testing\PayloadType */
-    public $response_type = null;
-
+    public $response_type = \grpc\testing\PayloadType::COMPRESSABLE;
+    
     /**  @var int */
     public $response_size = null;
-
+    
     /**  @var \grpc\testing\Payload */
     public $payload = null;
-
+    
     /**  @var boolean */
     public $fill_username = null;
-
+    
     /**  @var boolean */
     public $fill_oauth_scope = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -163,6 +164,7 @@ namespace grpc\testing {
       $f->type      = \DrSlump\Protobuf::TYPE_ENUM;
       $f->rule      = \DrSlump\Protobuf::RULE_OPTIONAL;
       $f->reference = '\grpc\testing\PayloadType';
+      $f->default   = \grpc\testing\PayloadType::COMPRESSABLE;
       $descriptor->addField($f);
 
       // OPTIONAL INT32 response_size = 2
@@ -213,7 +215,7 @@ namespace grpc\testing {
     public function hasResponseType(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <response_type> value
      *
@@ -222,7 +224,7 @@ namespace grpc\testing {
     public function clearResponseType(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <response_type> value
      *
@@ -231,7 +233,7 @@ namespace grpc\testing {
     public function getResponseType(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <response_type> value
      *
@@ -241,7 +243,7 @@ namespace grpc\testing {
     public function setResponseType( $value){
       return $this->_set(1, $value);
     }
-
+    
     /**
      * Check if <response_size> has a value
      *
@@ -250,7 +252,7 @@ namespace grpc\testing {
     public function hasResponseSize(){
       return $this->_has(2);
     }
-
+    
     /**
      * Clear <response_size> value
      *
@@ -259,7 +261,7 @@ namespace grpc\testing {
     public function clearResponseSize(){
       return $this->_clear(2);
     }
-
+    
     /**
      * Get <response_size> value
      *
@@ -268,7 +270,7 @@ namespace grpc\testing {
     public function getResponseSize(){
       return $this->_get(2);
     }
-
+    
     /**
      * Set <response_size> value
      *
@@ -278,7 +280,7 @@ namespace grpc\testing {
     public function setResponseSize( $value){
       return $this->_set(2, $value);
     }
-
+    
     /**
      * Check if <payload> has a value
      *
@@ -287,7 +289,7 @@ namespace grpc\testing {
     public function hasPayload(){
       return $this->_has(3);
     }
-
+    
     /**
      * Clear <payload> value
      *
@@ -296,7 +298,7 @@ namespace grpc\testing {
     public function clearPayload(){
       return $this->_clear(3);
     }
-
+    
     /**
      * Get <payload> value
      *
@@ -305,7 +307,7 @@ namespace grpc\testing {
     public function getPayload(){
       return $this->_get(3);
     }
-
+    
     /**
      * Set <payload> value
      *
@@ -315,7 +317,7 @@ namespace grpc\testing {
     public function setPayload(\grpc\testing\Payload $value){
       return $this->_set(3, $value);
     }
-
+    
     /**
      * Check if <fill_username> has a value
      *
@@ -324,7 +326,7 @@ namespace grpc\testing {
     public function hasFillUsername(){
       return $this->_has(4);
     }
-
+    
     /**
      * Clear <fill_username> value
      *
@@ -333,7 +335,7 @@ namespace grpc\testing {
     public function clearFillUsername(){
       return $this->_clear(4);
     }
-
+    
     /**
      * Get <fill_username> value
      *
@@ -342,7 +344,7 @@ namespace grpc\testing {
     public function getFillUsername(){
       return $this->_get(4);
     }
-
+    
     /**
      * Set <fill_username> value
      *
@@ -352,7 +354,7 @@ namespace grpc\testing {
     public function setFillUsername( $value){
       return $this->_set(4, $value);
     }
-
+    
     /**
      * Check if <fill_oauth_scope> has a value
      *
@@ -361,7 +363,7 @@ namespace grpc\testing {
     public function hasFillOauthScope(){
       return $this->_has(5);
     }
-
+    
     /**
      * Clear <fill_oauth_scope> value
      *
@@ -370,7 +372,7 @@ namespace grpc\testing {
     public function clearFillOauthScope(){
       return $this->_clear(5);
     }
-
+    
     /**
      * Get <fill_oauth_scope> value
      *
@@ -379,7 +381,7 @@ namespace grpc\testing {
     public function getFillOauthScope(){
       return $this->_get(5);
     }
-
+    
     /**
      * Set <fill_oauth_scope> value
      *
@@ -398,13 +400,13 @@ namespace grpc\testing {
 
     /**  @var \grpc\testing\Payload */
     public $payload = null;
-
+    
     /**  @var string */
     public $username = null;
-
+    
     /**  @var string */
     public $oauth_scope = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -453,7 +455,7 @@ namespace grpc\testing {
     public function hasPayload(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <payload> value
      *
@@ -462,7 +464,7 @@ namespace grpc\testing {
     public function clearPayload(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <payload> value
      *
@@ -471,7 +473,7 @@ namespace grpc\testing {
     public function getPayload(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <payload> value
      *
@@ -481,7 +483,7 @@ namespace grpc\testing {
     public function setPayload(\grpc\testing\Payload $value){
       return $this->_set(1, $value);
     }
-
+    
     /**
      * Check if <username> has a value
      *
@@ -490,7 +492,7 @@ namespace grpc\testing {
     public function hasUsername(){
       return $this->_has(2);
     }
-
+    
     /**
      * Clear <username> value
      *
@@ -499,7 +501,7 @@ namespace grpc\testing {
     public function clearUsername(){
       return $this->_clear(2);
     }
-
+    
     /**
      * Get <username> value
      *
@@ -508,7 +510,7 @@ namespace grpc\testing {
     public function getUsername(){
       return $this->_get(2);
     }
-
+    
     /**
      * Set <username> value
      *
@@ -518,7 +520,7 @@ namespace grpc\testing {
     public function setUsername( $value){
       return $this->_set(2, $value);
     }
-
+    
     /**
      * Check if <oauth_scope> has a value
      *
@@ -527,7 +529,7 @@ namespace grpc\testing {
     public function hasOauthScope(){
       return $this->_has(3);
     }
-
+    
     /**
      * Clear <oauth_scope> value
      *
@@ -536,7 +538,7 @@ namespace grpc\testing {
     public function clearOauthScope(){
       return $this->_clear(3);
     }
-
+    
     /**
      * Get <oauth_scope> value
      *
@@ -545,7 +547,7 @@ namespace grpc\testing {
     public function getOauthScope(){
       return $this->_get(3);
     }
-
+    
     /**
      * Set <oauth_scope> value
      *
@@ -564,7 +566,7 @@ namespace grpc\testing {
 
     /**  @var \grpc\testing\Payload */
     public $payload = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -597,7 +599,7 @@ namespace grpc\testing {
     public function hasPayload(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <payload> value
      *
@@ -606,7 +608,7 @@ namespace grpc\testing {
     public function clearPayload(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <payload> value
      *
@@ -615,7 +617,7 @@ namespace grpc\testing {
     public function getPayload(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <payload> value
      *
@@ -634,7 +636,7 @@ namespace grpc\testing {
 
     /**  @var int */
     public $aggregated_payload_size = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -666,7 +668,7 @@ namespace grpc\testing {
     public function hasAggregatedPayloadSize(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <aggregated_payload_size> value
      *
@@ -675,7 +677,7 @@ namespace grpc\testing {
     public function clearAggregatedPayloadSize(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <aggregated_payload_size> value
      *
@@ -684,7 +686,7 @@ namespace grpc\testing {
     public function getAggregatedPayloadSize(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <aggregated_payload_size> value
      *
@@ -703,10 +705,10 @@ namespace grpc\testing {
 
     /**  @var int */
     public $size = null;
-
+    
     /**  @var int */
     public $interval_us = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -746,7 +748,7 @@ namespace grpc\testing {
     public function hasSize(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <size> value
      *
@@ -755,7 +757,7 @@ namespace grpc\testing {
     public function clearSize(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <size> value
      *
@@ -764,7 +766,7 @@ namespace grpc\testing {
     public function getSize(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <size> value
      *
@@ -774,7 +776,7 @@ namespace grpc\testing {
     public function setSize( $value){
       return $this->_set(1, $value);
     }
-
+    
     /**
      * Check if <interval_us> has a value
      *
@@ -783,7 +785,7 @@ namespace grpc\testing {
     public function hasIntervalUs(){
       return $this->_has(2);
     }
-
+    
     /**
      * Clear <interval_us> value
      *
@@ -792,7 +794,7 @@ namespace grpc\testing {
     public function clearIntervalUs(){
       return $this->_clear(2);
     }
-
+    
     /**
      * Get <interval_us> value
      *
@@ -801,7 +803,7 @@ namespace grpc\testing {
     public function getIntervalUs(){
       return $this->_get(2);
     }
-
+    
     /**
      * Set <interval_us> value
      *
@@ -819,14 +821,14 @@ namespace grpc\testing {
   class StreamingOutputCallRequest extends \DrSlump\Protobuf\Message {
 
     /**  @var int - \grpc\testing\PayloadType */
-    public $response_type = null;
-
+    public $response_type = \grpc\testing\PayloadType::COMPRESSABLE;
+    
     /**  @var \grpc\testing\ResponseParameters[]  */
     public $response_parameters = array();
-
+    
     /**  @var \grpc\testing\Payload */
     public $payload = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -842,6 +844,7 @@ namespace grpc\testing {
       $f->type      = \DrSlump\Protobuf::TYPE_ENUM;
       $f->rule      = \DrSlump\Protobuf::RULE_OPTIONAL;
       $f->reference = '\grpc\testing\PayloadType';
+      $f->default   = \grpc\testing\PayloadType::COMPRESSABLE;
       $descriptor->addField($f);
 
       // REPEATED MESSAGE response_parameters = 2
@@ -877,7 +880,7 @@ namespace grpc\testing {
     public function hasResponseType(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <response_type> value
      *
@@ -886,7 +889,7 @@ namespace grpc\testing {
     public function clearResponseType(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <response_type> value
      *
@@ -895,7 +898,7 @@ namespace grpc\testing {
     public function getResponseType(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <response_type> value
      *
@@ -905,7 +908,7 @@ namespace grpc\testing {
     public function setResponseType( $value){
       return $this->_set(1, $value);
     }
-
+    
     /**
      * Check if <response_parameters> has a value
      *
@@ -914,7 +917,7 @@ namespace grpc\testing {
     public function hasResponseParameters(){
       return $this->_has(2);
     }
-
+    
     /**
      * Clear <response_parameters> value
      *
@@ -923,7 +926,7 @@ namespace grpc\testing {
     public function clearResponseParameters(){
       return $this->_clear(2);
     }
-
+    
     /**
      * Get <response_parameters> value
      *
@@ -933,7 +936,7 @@ namespace grpc\testing {
     public function getResponseParameters($idx = NULL){
       return $this->_get(2, $idx);
     }
-
+    
     /**
      * Set <response_parameters> value
      *
@@ -943,7 +946,7 @@ namespace grpc\testing {
     public function setResponseParameters(\grpc\testing\ResponseParameters $value, $idx = NULL){
       return $this->_set(2, $value, $idx);
     }
-
+    
     /**
      * Get all elements of <response_parameters>
      *
@@ -952,7 +955,7 @@ namespace grpc\testing {
     public function getResponseParametersList(){
      return $this->_get(2);
     }
-
+    
     /**
      * Add a new element to <response_parameters>
      *
@@ -962,7 +965,7 @@ namespace grpc\testing {
     public function addResponseParameters(\grpc\testing\ResponseParameters $value){
      return $this->_add(2, $value);
     }
-
+    
     /**
      * Check if <payload> has a value
      *
@@ -971,7 +974,7 @@ namespace grpc\testing {
     public function hasPayload(){
       return $this->_has(3);
     }
-
+    
     /**
      * Clear <payload> value
      *
@@ -980,7 +983,7 @@ namespace grpc\testing {
     public function clearPayload(){
       return $this->_clear(3);
     }
-
+    
     /**
      * Get <payload> value
      *
@@ -989,7 +992,7 @@ namespace grpc\testing {
     public function getPayload(){
       return $this->_get(3);
     }
-
+    
     /**
      * Set <payload> value
      *
@@ -1008,7 +1011,7 @@ namespace grpc\testing {
 
     /**  @var \grpc\testing\Payload */
     public $payload = null;
-
+    
 
     /** @var \Closure[] */
     protected static $__extensions = array();
@@ -1041,7 +1044,7 @@ namespace grpc\testing {
     public function hasPayload(){
       return $this->_has(1);
     }
-
+    
     /**
      * Clear <payload> value
      *
@@ -1050,7 +1053,7 @@ namespace grpc\testing {
     public function clearPayload(){
       return $this->_clear(1);
     }
-
+    
     /**
      * Get <payload> value
      *
@@ -1059,7 +1062,7 @@ namespace grpc\testing {
     public function getPayload(){
       return $this->_get(1);
     }
-
+    
     /**
      * Set <payload> value
      *

+ 2 - 2
src/php/tests/interop/test.php

@@ -1,7 +1,7 @@
 <?php
 // DO NOT EDIT! Generated by Protobuf-PHP protoc plugin 1.0
-// Source: test/cpp/interop/test.proto
-//   Date: 2015-01-30 23:30:46
+// Source: test.proto
+//   Date: 2015-04-01 00:58:16
 
 namespace grpc\testing {
 

+ 1 - 1
src/php/tests/interop/test.proto

@@ -41,7 +41,7 @@ package grpc.testing;
 // performance with various types of payload.
 service TestService {
   // One empty request followed by one empty response.
-  rpc EmptyCall(grpc.testing.Empty) returns (grpc.testing.Empty);
+  rpc EmptyCall(grpc.testing.EmptyMessage) returns (grpc.testing.EmptyMessage);
 
   // One request followed by one response.
   // TODO(Issue 527): Describe required server behavior.