Browse Source

Update protobuf version (#6898)

Rafi Kamal 5 years ago
parent
commit
3cc55d6167
38 changed files with 120 additions and 106 deletions
  1. 1 1
      Protobuf-C++.podspec
  2. 1 1
      Protobuf.podspec
  3. 1 1
      configure.ac
  4. 1 1
      csharp/Google.Protobuf.Tools.nuspec
  5. 1 1
      csharp/src/Google.Protobuf/Google.Protobuf.csproj
  6. 1 1
      java/bom/pom.xml
  7. 1 1
      java/core/pom.xml
  8. 1 1
      java/lite/pom.xml
  9. 1 1
      java/pom.xml
  10. 1 1
      java/util/pom.xml
  11. 1 1
      js/package.json
  12. 17 3
      php/ext/google/protobuf/package.xml
  13. 1 1
      php/ext/google/protobuf/protobuf.h
  14. 2 2
      php/src/Google/Protobuf/Internal/DescriptorProto.php
  15. 3 3
      php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php
  16. 2 2
      php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php
  17. 2 2
      php/src/Google/Protobuf/Internal/EnumDescriptorProto.php
  18. 2 2
      php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php
  19. 2 2
      php/src/Google/Protobuf/Internal/EnumOptions.php
  20. 3 3
      php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php
  21. 1 1
      php/src/Google/Protobuf/Internal/EnumValueOptions.php
  22. 10 10
      php/src/Google/Protobuf/Internal/FieldDescriptorProto.php
  23. 6 6
      php/src/Google/Protobuf/Internal/FieldOptions.php
  24. 5 5
      php/src/Google/Protobuf/Internal/FileDescriptorProto.php
  25. 20 20
      php/src/Google/Protobuf/Internal/FileOptions.php
  26. 3 3
      php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php
  27. 4 4
      php/src/Google/Protobuf/Internal/MessageOptions.php
  28. 6 6
      php/src/Google/Protobuf/Internal/MethodDescriptorProto.php
  29. 2 2
      php/src/Google/Protobuf/Internal/MethodOptions.php
  30. 2 2
      php/src/Google/Protobuf/Internal/OneofDescriptorProto.php
  31. 2 2
      php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php
  32. 1 1
      php/src/Google/Protobuf/Internal/ServiceOptions.php
  33. 2 2
      php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php
  34. 6 6
      php/src/Google/Protobuf/Internal/UninterpretedOption.php
  35. 2 2
      php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php
  36. 1 1
      protoc-artifacts/pom.xml
  37. 1 1
      python/google/protobuf/__init__.py
  38. 1 1
      ruby/google-protobuf.gemspec

+ 1 - 1
Protobuf-C++.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 Pod::Spec.new do |s|
   s.name     = 'Protobuf-C++'
   s.name     = 'Protobuf-C++'
-  s.version  = '3.11.0-rc0'
+  s.version  = '3.11.0-rc1'
   s.summary  = 'Protocol Buffers v3 runtime library for C++.'
   s.summary  = 'Protocol Buffers v3 runtime library for C++.'
   s.homepage = 'https://github.com/google/protobuf'
   s.homepage = 'https://github.com/google/protobuf'
   s.license  = '3-Clause BSD License'
   s.license  = '3-Clause BSD License'

+ 1 - 1
Protobuf.podspec

@@ -5,7 +5,7 @@
 # dependent projects use the :git notation to refer to the library.
 # dependent projects use the :git notation to refer to the library.
 Pod::Spec.new do |s|
 Pod::Spec.new do |s|
   s.name     = 'Protobuf'
   s.name     = 'Protobuf'
-  s.version  = '3.11.0-rc0'
+  s.version  = '3.11.0-rc1'
   s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
   s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
   s.homepage = 'https://github.com/protocolbuffers/protobuf'
   s.homepage = 'https://github.com/protocolbuffers/protobuf'
   s.license  = '3-Clause BSD License'
   s.license  = '3-Clause BSD License'

+ 1 - 1
configure.ac

@@ -17,7 +17,7 @@ AC_PREREQ(2.59)
 # In the SVN trunk, the version should always be the next anticipated release
 # In the SVN trunk, the version should always be the next anticipated release
 # version with the "-pre" suffix.  (We used to use "-SNAPSHOT" but this pushed
 # version with the "-pre" suffix.  (We used to use "-SNAPSHOT" but this pushed
 # the size of one file name in the dist tarfile over the 99-char limit.)
 # the size of one file name in the dist tarfile over the 99-char limit.)
-AC_INIT([Protocol Buffers],[3.11.0-rc-0],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[3.11.0-rc-1],[protobuf@googlegroups.com],[protobuf])
 
 
 AM_MAINTAINER_MODE([enable])
 AM_MAINTAINER_MODE([enable])
 
 

+ 1 - 1
csharp/Google.Protobuf.Tools.nuspec

@@ -5,7 +5,7 @@
     <title>Google Protocol Buffers tools</title>
     <title>Google Protocol Buffers tools</title>
     <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
     <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
     <description>See project site for more info.</description>
     <description>See project site for more info.</description>
-    <version>3.11.0-rc0</version>
+    <version>3.11.0-rc1</version>
     <authors>Google Inc.</authors>
     <authors>Google Inc.</authors>
     <owners>protobuf-packages</owners>
     <owners>protobuf-packages</owners>
     <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>
     <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>

+ 1 - 1
csharp/src/Google.Protobuf/Google.Protobuf.csproj

@@ -4,7 +4,7 @@
     <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
     <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
     <Copyright>Copyright 2015, Google Inc.</Copyright>
     <Copyright>Copyright 2015, Google Inc.</Copyright>
     <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
     <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
-    <VersionPrefix>3.11.0-rc0</VersionPrefix>
+    <VersionPrefix>3.11.0-rc1</VersionPrefix>
     <LangVersion>6</LangVersion>
     <LangVersion>6</LangVersion>
     <Authors>Google Inc.</Authors>
     <Authors>Google Inc.</Authors>
     <TargetFrameworks>netstandard1.0;netstandard2.0;net45</TargetFrameworks>
     <TargetFrameworks>netstandard1.0;netstandard2.0;net45</TargetFrameworks>

+ 1 - 1
java/bom/pom.xml

@@ -4,7 +4,7 @@
 
 
   <groupId>com.google.protobuf</groupId>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
   <artifactId>protobuf-bom</artifactId>
-  <version>3.11.0-rc-0</version>
+  <version>3.11.0-rc-1</version>
   <packaging>pom</packaging>
   <packaging>pom</packaging>
 
 
   <name>Protocol Buffers [BOM]</name>
   <name>Protocol Buffers [BOM]</name>

+ 1 - 1
java/core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
   <parent>
     <groupId>com.google.protobuf</groupId>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.11.0-rc-0</version>
+    <version>3.11.0-rc-1</version>
   </parent>
   </parent>
 
 
   <artifactId>protobuf-java</artifactId>
   <artifactId>protobuf-java</artifactId>

+ 1 - 1
java/lite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
   <parent>
     <groupId>com.google.protobuf</groupId>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.11.0-rc-0</version>
+    <version>3.11.0-rc-1</version>
   </parent>
   </parent>
 
 
   <artifactId>protobuf-javalite</artifactId>
   <artifactId>protobuf-javalite</artifactId>

+ 1 - 1
java/pom.xml

@@ -4,7 +4,7 @@
 
 
   <groupId>com.google.protobuf</groupId>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-parent</artifactId>
   <artifactId>protobuf-parent</artifactId>
-  <version>3.11.0-rc-0</version>
+  <version>3.11.0-rc-1</version>
   <packaging>pom</packaging>
   <packaging>pom</packaging>
 
 
   <name>Protocol Buffers [Parent]</name>
   <name>Protocol Buffers [Parent]</name>

+ 1 - 1
java/util/pom.xml

@@ -4,7 +4,7 @@
   <parent>
   <parent>
     <groupId>com.google.protobuf</groupId>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.11.0-rc-0</version>
+    <version>3.11.0-rc-1</version>
   </parent>
   </parent>
 
 
   <artifactId>protobuf-java-util</artifactId>
   <artifactId>protobuf-java-util</artifactId>

+ 1 - 1
js/package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "google-protobuf",
   "name": "google-protobuf",
-  "version": "3.11.0-rc.0",
+  "version": "3.11.0-rc.1",
   "description": "Protocol Buffers for JavaScript",
   "description": "Protocol Buffers for JavaScript",
   "main": "google-protobuf.js",
   "main": "google-protobuf.js",
   "files": [
   "files": [

+ 17 - 3
php/ext/google/protobuf/package.xml

@@ -10,10 +10,10 @@
   <email>protobuf-opensource@google.com</email>
   <email>protobuf-opensource@google.com</email>
   <active>yes</active>
   <active>yes</active>
  </lead>
  </lead>
- <date>2019-10-03</date>
- <time>14:24:03</time>
+ <date>2019-11-15</date>
+ <time>11:44:18</time>
  <version>
  <version>
-  <release>3.11.0RC0</release>
+  <release>3.11.0RC1</release>
   <api>3.11.0</api>
   <api>3.11.0</api>
  </version>
  </version>
  <stability>
  <stability>
@@ -431,5 +431,19 @@ G  A release.
    <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
    <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
    <notes>GA release.</notes>
    <notes>GA release.</notes>
   </release>
   </release>
+  <release>
+   <version>
+    <release>3.11.0RC1</release>
+    <api>3.11.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2019-11-15</date>
+   <time>11:44:18</time>
+   <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
+   <notes>GA release.</notes>
+  </release>
  </changelog>
  </changelog>
 </package>
 </package>

+ 1 - 1
php/ext/google/protobuf/protobuf.h

@@ -37,7 +37,7 @@
 #include "upb.h"
 #include "upb.h"
 
 
 #define PHP_PROTOBUF_EXTNAME "protobuf"
 #define PHP_PROTOBUF_EXTNAME "protobuf"
-#define PHP_PROTOBUF_VERSION "3.11.0RC0"
+#define PHP_PROTOBUF_VERSION "3.11.0RC1"
 
 
 #define MAX_LENGTH_OF_INT64 20
 #define MAX_LENGTH_OF_INT64 20
 #define SIZEOF_INT64 8
 #define SIZEOF_INT64 8

+ 2 - 2
php/src/Google/Protobuf/Internal/DescriptorProto.php

@@ -20,7 +20,7 @@ class DescriptorProto extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
      * Generated from protobuf field <code>optional string name = 1;</code>
      */
      */
-    private $name = '';
+    protected $name = '';
     private $has_name = false;
     private $has_name = false;
     /**
     /**
      * Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto field = 2;</code>
      * Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto field = 2;</code>
@@ -55,7 +55,7 @@ class DescriptorProto extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.MessageOptions options = 7;</code>
      * Generated from protobuf field <code>optional .google.protobuf.MessageOptions options = 7;</code>
      */
      */
-    private $options = null;
+    protected $options = null;
     private $has_options = false;
     private $has_options = false;
     /**
     /**
      * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;</code>
      * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;</code>

+ 3 - 3
php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php

@@ -20,19 +20,19 @@ class ExtensionRange extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional int32 start = 1;</code>
      * Generated from protobuf field <code>optional int32 start = 1;</code>
      */
      */
-    private $start = 0;
+    protected $start = 0;
     private $has_start = false;
     private $has_start = false;
     /**
     /**
      * Exclusive.
      * Exclusive.
      *
      *
      * Generated from protobuf field <code>optional int32 end = 2;</code>
      * Generated from protobuf field <code>optional int32 end = 2;</code>
      */
      */
-    private $end = 0;
+    protected $end = 0;
     private $has_end = false;
     private $has_end = false;
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.ExtensionRangeOptions options = 3;</code>
      * Generated from protobuf field <code>optional .google.protobuf.ExtensionRangeOptions options = 3;</code>
      */
      */
-    private $options = null;
+    protected $options = null;
     private $has_options = false;
     private $has_options = false;
 
 
     /**
     /**

+ 2 - 2
php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php

@@ -24,14 +24,14 @@ class ReservedRange extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional int32 start = 1;</code>
      * Generated from protobuf field <code>optional int32 start = 1;</code>
      */
      */
-    private $start = 0;
+    protected $start = 0;
     private $has_start = false;
     private $has_start = false;
     /**
     /**
      * Exclusive.
      * Exclusive.
      *
      *
      * Generated from protobuf field <code>optional int32 end = 2;</code>
      * Generated from protobuf field <code>optional int32 end = 2;</code>
      */
      */
-    private $end = 0;
+    protected $end = 0;
     private $has_end = false;
     private $has_end = false;
 
 
     /**
     /**

+ 2 - 2
php/src/Google/Protobuf/Internal/EnumDescriptorProto.php

@@ -20,7 +20,7 @@ class EnumDescriptorProto extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
      * Generated from protobuf field <code>optional string name = 1;</code>
      */
      */
-    private $name = '';
+    protected $name = '';
     private $has_name = false;
     private $has_name = false;
     /**
     /**
      * Generated from protobuf field <code>repeated .google.protobuf.EnumValueDescriptorProto value = 2;</code>
      * Generated from protobuf field <code>repeated .google.protobuf.EnumValueDescriptorProto value = 2;</code>
@@ -30,7 +30,7 @@ class EnumDescriptorProto extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.EnumOptions options = 3;</code>
      * Generated from protobuf field <code>optional .google.protobuf.EnumOptions options = 3;</code>
      */
      */
-    private $options = null;
+    protected $options = null;
     private $has_options = false;
     private $has_options = false;
     /**
     /**
      * Range of reserved numeric values. Reserved numeric values may not be used
      * Range of reserved numeric values. Reserved numeric values may not be used

+ 2 - 2
php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php

@@ -26,14 +26,14 @@ class EnumReservedRange extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional int32 start = 1;</code>
      * Generated from protobuf field <code>optional int32 start = 1;</code>
      */
      */
-    private $start = 0;
+    protected $start = 0;
     private $has_start = false;
     private $has_start = false;
     /**
     /**
      * Inclusive.
      * Inclusive.
      *
      *
      * Generated from protobuf field <code>optional int32 end = 2;</code>
      * Generated from protobuf field <code>optional int32 end = 2;</code>
      */
      */
-    private $end = 0;
+    protected $end = 0;
     private $has_end = false;
     private $has_end = false;
 
 
     /**
     /**

+ 2 - 2
php/src/Google/Protobuf/Internal/EnumOptions.php

@@ -21,7 +21,7 @@ class EnumOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool allow_alias = 2;</code>
      * Generated from protobuf field <code>optional bool allow_alias = 2;</code>
      */
      */
-    private $allow_alias = false;
+    protected $allow_alias = false;
     private $has_allow_alias = false;
     private $has_allow_alias = false;
     /**
     /**
      * Is this enum deprecated?
      * Is this enum deprecated?
@@ -31,7 +31,7 @@ class EnumOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
      * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
      */
      */
-    private $deprecated = false;
+    protected $deprecated = false;
     private $has_deprecated = false;
     private $has_deprecated = false;
     /**
     /**
      * The parser stores options it doesn't recognize here. See above.
      * The parser stores options it doesn't recognize here. See above.

+ 3 - 3
php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php

@@ -20,17 +20,17 @@ class EnumValueDescriptorProto extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
      * Generated from protobuf field <code>optional string name = 1;</code>
      */
      */
-    private $name = '';
+    protected $name = '';
     private $has_name = false;
     private $has_name = false;
     /**
     /**
      * Generated from protobuf field <code>optional int32 number = 2;</code>
      * Generated from protobuf field <code>optional int32 number = 2;</code>
      */
      */
-    private $number = 0;
+    protected $number = 0;
     private $has_number = false;
     private $has_number = false;
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.EnumValueOptions options = 3;</code>
      * Generated from protobuf field <code>optional .google.protobuf.EnumValueOptions options = 3;</code>
      */
      */
-    private $options = null;
+    protected $options = null;
     private $has_options = false;
     private $has_options = false;
 
 
     /**
     /**

+ 1 - 1
php/src/Google/Protobuf/Internal/EnumValueOptions.php

@@ -23,7 +23,7 @@ class EnumValueOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool deprecated = 1 [default = false];</code>
      * Generated from protobuf field <code>optional bool deprecated = 1 [default = false];</code>
      */
      */
-    private $deprecated = false;
+    protected $deprecated = false;
     private $has_deprecated = false;
     private $has_deprecated = false;
     /**
     /**
      * The parser stores options it doesn't recognize here. See above.
      * The parser stores options it doesn't recognize here. See above.

+ 10 - 10
php/src/Google/Protobuf/Internal/FieldDescriptorProto.php

@@ -20,17 +20,17 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
      * Generated from protobuf field <code>optional string name = 1;</code>
      */
      */
-    private $name = '';
+    protected $name = '';
     private $has_name = false;
     private $has_name = false;
     /**
     /**
      * Generated from protobuf field <code>optional int32 number = 3;</code>
      * Generated from protobuf field <code>optional int32 number = 3;</code>
      */
      */
-    private $number = 0;
+    protected $number = 0;
     private $has_number = false;
     private $has_number = false;
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Label label = 4;</code>
      * Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Label label = 4;</code>
      */
      */
-    private $label = 0;
+    protected $label = 0;
     private $has_label = false;
     private $has_label = false;
     /**
     /**
      * If type_name is set, this need not be set.  If both this and type_name
      * If type_name is set, this need not be set.  If both this and type_name
@@ -38,7 +38,7 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Type type = 5;</code>
      * Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Type type = 5;</code>
      */
      */
-    private $type = 0;
+    protected $type = 0;
     private $has_type = false;
     private $has_type = false;
     /**
     /**
      * For message and enum types, this is the name of the type.  If the name
      * For message and enum types, this is the name of the type.  If the name
@@ -49,7 +49,7 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string type_name = 6;</code>
      * Generated from protobuf field <code>optional string type_name = 6;</code>
      */
      */
-    private $type_name = '';
+    protected $type_name = '';
     private $has_type_name = false;
     private $has_type_name = false;
     /**
     /**
      * For extensions, this is the name of the type being extended.  It is
      * For extensions, this is the name of the type being extended.  It is
@@ -57,7 +57,7 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string extendee = 2;</code>
      * Generated from protobuf field <code>optional string extendee = 2;</code>
      */
      */
-    private $extendee = '';
+    protected $extendee = '';
     private $has_extendee = false;
     private $has_extendee = false;
     /**
     /**
      * For numeric types, contains the original text representation of the value.
      * For numeric types, contains the original text representation of the value.
@@ -68,7 +68,7 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string default_value = 7;</code>
      * Generated from protobuf field <code>optional string default_value = 7;</code>
      */
      */
-    private $default_value = '';
+    protected $default_value = '';
     private $has_default_value = false;
     private $has_default_value = false;
     /**
     /**
      * If set, gives the index of a oneof in the containing type's oneof_decl
      * If set, gives the index of a oneof in the containing type's oneof_decl
@@ -76,7 +76,7 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional int32 oneof_index = 9;</code>
      * Generated from protobuf field <code>optional int32 oneof_index = 9;</code>
      */
      */
-    private $oneof_index = 0;
+    protected $oneof_index = 0;
     private $has_oneof_index = false;
     private $has_oneof_index = false;
     /**
     /**
      * JSON name of this field. The value is set by protocol compiler. If the
      * JSON name of this field. The value is set by protocol compiler. If the
@@ -86,12 +86,12 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string json_name = 10;</code>
      * Generated from protobuf field <code>optional string json_name = 10;</code>
      */
      */
-    private $json_name = '';
+    protected $json_name = '';
     private $has_json_name = false;
     private $has_json_name = false;
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.FieldOptions options = 8;</code>
      * Generated from protobuf field <code>optional .google.protobuf.FieldOptions options = 8;</code>
      */
      */
-    private $options = null;
+    protected $options = null;
     private $has_options = false;
     private $has_options = false;
 
 
     /**
     /**

+ 6 - 6
php/src/Google/Protobuf/Internal/FieldOptions.php

@@ -23,7 +23,7 @@ class FieldOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];</code>
      * Generated from protobuf field <code>optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];</code>
      */
      */
-    private $ctype = 0;
+    protected $ctype = 0;
     private $has_ctype = false;
     private $has_ctype = false;
     /**
     /**
      * The packed option can be enabled for repeated primitive fields to enable
      * The packed option can be enabled for repeated primitive fields to enable
@@ -34,7 +34,7 @@ class FieldOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool packed = 2;</code>
      * Generated from protobuf field <code>optional bool packed = 2;</code>
      */
      */
-    private $packed = false;
+    protected $packed = false;
     private $has_packed = false;
     private $has_packed = false;
     /**
     /**
      * The jstype option determines the JavaScript type used for values of the
      * The jstype option determines the JavaScript type used for values of the
@@ -50,7 +50,7 @@ class FieldOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];</code>
      * Generated from protobuf field <code>optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];</code>
      */
      */
-    private $jstype = 0;
+    protected $jstype = 0;
     private $has_jstype = false;
     private $has_jstype = false;
     /**
     /**
      * Should this field be parsed lazily?  Lazy applies only to message-type
      * Should this field be parsed lazily?  Lazy applies only to message-type
@@ -80,7 +80,7 @@ class FieldOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool lazy = 5 [default = false];</code>
      * Generated from protobuf field <code>optional bool lazy = 5 [default = false];</code>
      */
      */
-    private $lazy = false;
+    protected $lazy = false;
     private $has_lazy = false;
     private $has_lazy = false;
     /**
     /**
      * Is this field deprecated?
      * Is this field deprecated?
@@ -90,14 +90,14 @@ class FieldOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
      * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
      */
      */
-    private $deprecated = false;
+    protected $deprecated = false;
     private $has_deprecated = false;
     private $has_deprecated = false;
     /**
     /**
      * For Google-internal migration only. Do not use.
      * For Google-internal migration only. Do not use.
      *
      *
      * Generated from protobuf field <code>optional bool weak = 10 [default = false];</code>
      * Generated from protobuf field <code>optional bool weak = 10 [default = false];</code>
      */
      */
-    private $weak = false;
+    protected $weak = false;
     private $has_weak = false;
     private $has_weak = false;
     /**
     /**
      * The parser stores options it doesn't recognize here. See above.
      * The parser stores options it doesn't recognize here. See above.

+ 5 - 5
php/src/Google/Protobuf/Internal/FileDescriptorProto.php

@@ -22,14 +22,14 @@ class FileDescriptorProto extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string name = 1;</code>
      * Generated from protobuf field <code>optional string name = 1;</code>
      */
      */
-    private $name = '';
+    protected $name = '';
     private $has_name = false;
     private $has_name = false;
     /**
     /**
      * e.g. "foo", "foo.bar", etc.
      * e.g. "foo", "foo.bar", etc.
      *
      *
      * Generated from protobuf field <code>optional string package = 2;</code>
      * Generated from protobuf field <code>optional string package = 2;</code>
      */
      */
-    private $package = '';
+    protected $package = '';
     private $has_package = false;
     private $has_package = false;
     /**
     /**
      * Names of files imported by this file.
      * Names of files imported by this file.
@@ -78,7 +78,7 @@ class FileDescriptorProto extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.FileOptions options = 8;</code>
      * Generated from protobuf field <code>optional .google.protobuf.FileOptions options = 8;</code>
      */
      */
-    private $options = null;
+    protected $options = null;
     private $has_options = false;
     private $has_options = false;
     /**
     /**
      * This field contains optional information about the original source code.
      * This field contains optional information about the original source code.
@@ -88,7 +88,7 @@ class FileDescriptorProto extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional .google.protobuf.SourceCodeInfo source_code_info = 9;</code>
      * Generated from protobuf field <code>optional .google.protobuf.SourceCodeInfo source_code_info = 9;</code>
      */
      */
-    private $source_code_info = null;
+    protected $source_code_info = null;
     private $has_source_code_info = false;
     private $has_source_code_info = false;
     /**
     /**
      * The syntax of the proto file.
      * The syntax of the proto file.
@@ -96,7 +96,7 @@ class FileDescriptorProto extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string syntax = 12;</code>
      * Generated from protobuf field <code>optional string syntax = 12;</code>
      */
      */
-    private $syntax = '';
+    protected $syntax = '';
     private $has_syntax = false;
     private $has_syntax = false;
 
 
     /**
     /**

+ 20 - 20
php/src/Google/Protobuf/Internal/FileOptions.php

@@ -23,7 +23,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string java_package = 1;</code>
      * Generated from protobuf field <code>optional string java_package = 1;</code>
      */
      */
-    private $java_package = '';
+    protected $java_package = '';
     private $has_java_package = false;
     private $has_java_package = false;
     /**
     /**
      * If set, all the classes from the .proto file are wrapped in a single
      * If set, all the classes from the .proto file are wrapped in a single
@@ -34,7 +34,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string java_outer_classname = 8;</code>
      * Generated from protobuf field <code>optional string java_outer_classname = 8;</code>
      */
      */
-    private $java_outer_classname = '';
+    protected $java_outer_classname = '';
     private $has_java_outer_classname = false;
     private $has_java_outer_classname = false;
     /**
     /**
      * If set true, then the Java code generator will generate a separate .java
      * If set true, then the Java code generator will generate a separate .java
@@ -46,14 +46,14 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool java_multiple_files = 10 [default = false];</code>
      * Generated from protobuf field <code>optional bool java_multiple_files = 10 [default = false];</code>
      */
      */
-    private $java_multiple_files = false;
+    protected $java_multiple_files = false;
     private $has_java_multiple_files = false;
     private $has_java_multiple_files = false;
     /**
     /**
      * This option does nothing.
      * This option does nothing.
      *
      *
      * Generated from protobuf field <code>optional bool java_generate_equals_and_hash = 20 [deprecated = true];</code>
      * Generated from protobuf field <code>optional bool java_generate_equals_and_hash = 20 [deprecated = true];</code>
      */
      */
-    private $java_generate_equals_and_hash = false;
+    protected $java_generate_equals_and_hash = false;
     private $has_java_generate_equals_and_hash = false;
     private $has_java_generate_equals_and_hash = false;
     /**
     /**
      * If set true, then the Java2 code generator will generate code that
      * If set true, then the Java2 code generator will generate code that
@@ -65,12 +65,12 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool java_string_check_utf8 = 27 [default = false];</code>
      * Generated from protobuf field <code>optional bool java_string_check_utf8 = 27 [default = false];</code>
      */
      */
-    private $java_string_check_utf8 = false;
+    protected $java_string_check_utf8 = false;
     private $has_java_string_check_utf8 = false;
     private $has_java_string_check_utf8 = false;
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];</code>
      * Generated from protobuf field <code>optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];</code>
      */
      */
-    private $optimize_for = 0;
+    protected $optimize_for = 0;
     private $has_optimize_for = false;
     private $has_optimize_for = false;
     /**
     /**
      * Sets the Go package where structs generated from this .proto will be
      * Sets the Go package where structs generated from this .proto will be
@@ -81,7 +81,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string go_package = 11;</code>
      * Generated from protobuf field <code>optional string go_package = 11;</code>
      */
      */
-    private $go_package = '';
+    protected $go_package = '';
     private $has_go_package = false;
     private $has_go_package = false;
     /**
     /**
      * Should generic services be generated in each language?  "Generic" services
      * Should generic services be generated in each language?  "Generic" services
@@ -96,22 +96,22 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool cc_generic_services = 16 [default = false];</code>
      * Generated from protobuf field <code>optional bool cc_generic_services = 16 [default = false];</code>
      */
      */
-    private $cc_generic_services = false;
+    protected $cc_generic_services = false;
     private $has_cc_generic_services = false;
     private $has_cc_generic_services = false;
     /**
     /**
      * Generated from protobuf field <code>optional bool java_generic_services = 17 [default = false];</code>
      * Generated from protobuf field <code>optional bool java_generic_services = 17 [default = false];</code>
      */
      */
-    private $java_generic_services = false;
+    protected $java_generic_services = false;
     private $has_java_generic_services = false;
     private $has_java_generic_services = false;
     /**
     /**
      * Generated from protobuf field <code>optional bool py_generic_services = 18 [default = false];</code>
      * Generated from protobuf field <code>optional bool py_generic_services = 18 [default = false];</code>
      */
      */
-    private $py_generic_services = false;
+    protected $py_generic_services = false;
     private $has_py_generic_services = false;
     private $has_py_generic_services = false;
     /**
     /**
      * Generated from protobuf field <code>optional bool php_generic_services = 42 [default = false];</code>
      * Generated from protobuf field <code>optional bool php_generic_services = 42 [default = false];</code>
      */
      */
-    private $php_generic_services = false;
+    protected $php_generic_services = false;
     private $has_php_generic_services = false;
     private $has_php_generic_services = false;
     /**
     /**
      * Is this file deprecated?
      * Is this file deprecated?
@@ -121,7 +121,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool deprecated = 23 [default = false];</code>
      * Generated from protobuf field <code>optional bool deprecated = 23 [default = false];</code>
      */
      */
-    private $deprecated = false;
+    protected $deprecated = false;
     private $has_deprecated = false;
     private $has_deprecated = false;
     /**
     /**
      * Enables the use of arenas for the proto messages in this file. This applies
      * Enables the use of arenas for the proto messages in this file. This applies
@@ -129,7 +129,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool cc_enable_arenas = 31 [default = false];</code>
      * Generated from protobuf field <code>optional bool cc_enable_arenas = 31 [default = false];</code>
      */
      */
-    private $cc_enable_arenas = false;
+    protected $cc_enable_arenas = false;
     private $has_cc_enable_arenas = false;
     private $has_cc_enable_arenas = false;
     /**
     /**
      * Sets the objective c class prefix which is prepended to all objective c
      * Sets the objective c class prefix which is prepended to all objective c
@@ -137,14 +137,14 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string objc_class_prefix = 36;</code>
      * Generated from protobuf field <code>optional string objc_class_prefix = 36;</code>
      */
      */
-    private $objc_class_prefix = '';
+    protected $objc_class_prefix = '';
     private $has_objc_class_prefix = false;
     private $has_objc_class_prefix = false;
     /**
     /**
      * Namespace for generated classes; defaults to the package.
      * Namespace for generated classes; defaults to the package.
      *
      *
      * Generated from protobuf field <code>optional string csharp_namespace = 37;</code>
      * Generated from protobuf field <code>optional string csharp_namespace = 37;</code>
      */
      */
-    private $csharp_namespace = '';
+    protected $csharp_namespace = '';
     private $has_csharp_namespace = false;
     private $has_csharp_namespace = false;
     /**
     /**
      * By default Swift generators will take the proto package and CamelCase it
      * By default Swift generators will take the proto package and CamelCase it
@@ -154,7 +154,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string swift_prefix = 39;</code>
      * Generated from protobuf field <code>optional string swift_prefix = 39;</code>
      */
      */
-    private $swift_prefix = '';
+    protected $swift_prefix = '';
     private $has_swift_prefix = false;
     private $has_swift_prefix = false;
     /**
     /**
      * Sets the php class prefix which is prepended to all php generated classes
      * Sets the php class prefix which is prepended to all php generated classes
@@ -162,7 +162,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string php_class_prefix = 40;</code>
      * Generated from protobuf field <code>optional string php_class_prefix = 40;</code>
      */
      */
-    private $php_class_prefix = '';
+    protected $php_class_prefix = '';
     private $has_php_class_prefix = false;
     private $has_php_class_prefix = false;
     /**
     /**
      * Use this option to change the namespace of php generated classes. Default
      * Use this option to change the namespace of php generated classes. Default
@@ -171,7 +171,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string php_namespace = 41;</code>
      * Generated from protobuf field <code>optional string php_namespace = 41;</code>
      */
      */
-    private $php_namespace = '';
+    protected $php_namespace = '';
     private $has_php_namespace = false;
     private $has_php_namespace = false;
     /**
     /**
      * Use this option to change the namespace of php generated metadata classes.
      * Use this option to change the namespace of php generated metadata classes.
@@ -180,7 +180,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string php_metadata_namespace = 44;</code>
      * Generated from protobuf field <code>optional string php_metadata_namespace = 44;</code>
      */
      */
-    private $php_metadata_namespace = '';
+    protected $php_metadata_namespace = '';
     private $has_php_metadata_namespace = false;
     private $has_php_metadata_namespace = false;
     /**
     /**
      * Use this option to change the package of ruby generated classes. Default
      * Use this option to change the package of ruby generated classes. Default
@@ -189,7 +189,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string ruby_package = 45;</code>
      * Generated from protobuf field <code>optional string ruby_package = 45;</code>
      */
      */
-    private $ruby_package = '';
+    protected $ruby_package = '';
     private $has_ruby_package = false;
     private $has_ruby_package = false;
     /**
     /**
      * The parser stores options it doesn't recognize here.
      * The parser stores options it doesn't recognize here.

+ 3 - 3
php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php

@@ -28,7 +28,7 @@ class Annotation extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string source_file = 2;</code>
      * Generated from protobuf field <code>optional string source_file = 2;</code>
      */
      */
-    private $source_file = '';
+    protected $source_file = '';
     private $has_source_file = false;
     private $has_source_file = false;
     /**
     /**
      * Identifies the starting offset in bytes in the generated code
      * Identifies the starting offset in bytes in the generated code
@@ -36,7 +36,7 @@ class Annotation extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional int32 begin = 3;</code>
      * Generated from protobuf field <code>optional int32 begin = 3;</code>
      */
      */
-    private $begin = 0;
+    protected $begin = 0;
     private $has_begin = false;
     private $has_begin = false;
     /**
     /**
      * Identifies the ending offset in bytes in the generated code that
      * Identifies the ending offset in bytes in the generated code that
@@ -45,7 +45,7 @@ class Annotation extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional int32 end = 4;</code>
      * Generated from protobuf field <code>optional int32 end = 4;</code>
      */
      */
-    private $end = 0;
+    protected $end = 0;
     private $has_end = false;
     private $has_end = false;
 
 
     /**
     /**

+ 4 - 4
php/src/Google/Protobuf/Internal/MessageOptions.php

@@ -34,7 +34,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool message_set_wire_format = 1 [default = false];</code>
      * Generated from protobuf field <code>optional bool message_set_wire_format = 1 [default = false];</code>
      */
      */
-    private $message_set_wire_format = false;
+    protected $message_set_wire_format = false;
     private $has_message_set_wire_format = false;
     private $has_message_set_wire_format = false;
     /**
     /**
      * Disables the generation of the standard "descriptor()" accessor, which can
      * Disables the generation of the standard "descriptor()" accessor, which can
@@ -43,7 +43,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool no_standard_descriptor_accessor = 2 [default = false];</code>
      * Generated from protobuf field <code>optional bool no_standard_descriptor_accessor = 2 [default = false];</code>
      */
      */
-    private $no_standard_descriptor_accessor = false;
+    protected $no_standard_descriptor_accessor = false;
     private $has_no_standard_descriptor_accessor = false;
     private $has_no_standard_descriptor_accessor = false;
     /**
     /**
      * Is this message deprecated?
      * Is this message deprecated?
@@ -53,7 +53,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
      * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
      */
      */
-    private $deprecated = false;
+    protected $deprecated = false;
     private $has_deprecated = false;
     private $has_deprecated = false;
     /**
     /**
      * Whether the message is an automatically generated map entry type for the
      * Whether the message is an automatically generated map entry type for the
@@ -77,7 +77,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool map_entry = 7;</code>
      * Generated from protobuf field <code>optional bool map_entry = 7;</code>
      */
      */
-    private $map_entry = false;
+    protected $map_entry = false;
     private $has_map_entry = false;
     private $has_map_entry = false;
     /**
     /**
      * The parser stores options it doesn't recognize here. See above.
      * The parser stores options it doesn't recognize here. See above.

+ 6 - 6
php/src/Google/Protobuf/Internal/MethodDescriptorProto.php

@@ -20,7 +20,7 @@ class MethodDescriptorProto extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
      * Generated from protobuf field <code>optional string name = 1;</code>
      */
      */
-    private $name = '';
+    protected $name = '';
     private $has_name = false;
     private $has_name = false;
     /**
     /**
      * Input and output type names.  These are resolved in the same way as
      * Input and output type names.  These are resolved in the same way as
@@ -28,31 +28,31 @@ class MethodDescriptorProto extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string input_type = 2;</code>
      * Generated from protobuf field <code>optional string input_type = 2;</code>
      */
      */
-    private $input_type = '';
+    protected $input_type = '';
     private $has_input_type = false;
     private $has_input_type = false;
     /**
     /**
      * Generated from protobuf field <code>optional string output_type = 3;</code>
      * Generated from protobuf field <code>optional string output_type = 3;</code>
      */
      */
-    private $output_type = '';
+    protected $output_type = '';
     private $has_output_type = false;
     private $has_output_type = false;
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.MethodOptions options = 4;</code>
      * Generated from protobuf field <code>optional .google.protobuf.MethodOptions options = 4;</code>
      */
      */
-    private $options = null;
+    protected $options = null;
     private $has_options = false;
     private $has_options = false;
     /**
     /**
      * Identifies if client streams multiple client messages
      * Identifies if client streams multiple client messages
      *
      *
      * Generated from protobuf field <code>optional bool client_streaming = 5 [default = false];</code>
      * Generated from protobuf field <code>optional bool client_streaming = 5 [default = false];</code>
      */
      */
-    private $client_streaming = false;
+    protected $client_streaming = false;
     private $has_client_streaming = false;
     private $has_client_streaming = false;
     /**
     /**
      * Identifies if server streams multiple server messages
      * Identifies if server streams multiple server messages
      *
      *
      * Generated from protobuf field <code>optional bool server_streaming = 6 [default = false];</code>
      * Generated from protobuf field <code>optional bool server_streaming = 6 [default = false];</code>
      */
      */
-    private $server_streaming = false;
+    protected $server_streaming = false;
     private $has_server_streaming = false;
     private $has_server_streaming = false;
 
 
     /**
     /**

+ 2 - 2
php/src/Google/Protobuf/Internal/MethodOptions.php

@@ -23,12 +23,12 @@ class MethodOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool deprecated = 33 [default = false];</code>
      * Generated from protobuf field <code>optional bool deprecated = 33 [default = false];</code>
      */
      */
-    private $deprecated = false;
+    protected $deprecated = false;
     private $has_deprecated = false;
     private $has_deprecated = false;
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
      * Generated from protobuf field <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
      */
      */
-    private $idempotency_level = 0;
+    protected $idempotency_level = 0;
     private $has_idempotency_level = false;
     private $has_idempotency_level = false;
     /**
     /**
      * The parser stores options it doesn't recognize here. See above.
      * The parser stores options it doesn't recognize here. See above.

+ 2 - 2
php/src/Google/Protobuf/Internal/OneofDescriptorProto.php

@@ -20,12 +20,12 @@ class OneofDescriptorProto extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
      * Generated from protobuf field <code>optional string name = 1;</code>
      */
      */
-    private $name = '';
+    protected $name = '';
     private $has_name = false;
     private $has_name = false;
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.OneofOptions options = 2;</code>
      * Generated from protobuf field <code>optional .google.protobuf.OneofOptions options = 2;</code>
      */
      */
-    private $options = null;
+    protected $options = null;
     private $has_options = false;
     private $has_options = false;
 
 
     /**
     /**

+ 2 - 2
php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php

@@ -20,7 +20,7 @@ class ServiceDescriptorProto extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
      * Generated from protobuf field <code>optional string name = 1;</code>
      */
      */
-    private $name = '';
+    protected $name = '';
     private $has_name = false;
     private $has_name = false;
     /**
     /**
      * Generated from protobuf field <code>repeated .google.protobuf.MethodDescriptorProto method = 2;</code>
      * Generated from protobuf field <code>repeated .google.protobuf.MethodDescriptorProto method = 2;</code>
@@ -30,7 +30,7 @@ class ServiceDescriptorProto extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>optional .google.protobuf.ServiceOptions options = 3;</code>
      * Generated from protobuf field <code>optional .google.protobuf.ServiceOptions options = 3;</code>
      */
      */
-    private $options = null;
+    protected $options = null;
     private $has_options = false;
     private $has_options = false;
 
 
     /**
     /**

+ 1 - 1
php/src/Google/Protobuf/Internal/ServiceOptions.php

@@ -23,7 +23,7 @@ class ServiceOptions extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional bool deprecated = 33 [default = false];</code>
      * Generated from protobuf field <code>optional bool deprecated = 33 [default = false];</code>
      */
      */
-    private $deprecated = false;
+    protected $deprecated = false;
     private $has_deprecated = false;
     private $has_deprecated = false;
     /**
     /**
      * The parser stores options it doesn't recognize here. See above.
      * The parser stores options it doesn't recognize here. See above.

+ 2 - 2
php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php

@@ -93,12 +93,12 @@ class Location extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string leading_comments = 3;</code>
      * Generated from protobuf field <code>optional string leading_comments = 3;</code>
      */
      */
-    private $leading_comments = '';
+    protected $leading_comments = '';
     private $has_leading_comments = false;
     private $has_leading_comments = false;
     /**
     /**
      * Generated from protobuf field <code>optional string trailing_comments = 4;</code>
      * Generated from protobuf field <code>optional string trailing_comments = 4;</code>
      */
      */
-    private $trailing_comments = '';
+    protected $trailing_comments = '';
     private $has_trailing_comments = false;
     private $has_trailing_comments = false;
     /**
     /**
      * Generated from protobuf field <code>repeated string leading_detached_comments = 6;</code>
      * Generated from protobuf field <code>repeated string leading_detached_comments = 6;</code>

+ 6 - 6
php/src/Google/Protobuf/Internal/UninterpretedOption.php

@@ -33,32 +33,32 @@ class UninterpretedOption extends \Google\Protobuf\Internal\Message
      *
      *
      * Generated from protobuf field <code>optional string identifier_value = 3;</code>
      * Generated from protobuf field <code>optional string identifier_value = 3;</code>
      */
      */
-    private $identifier_value = '';
+    protected $identifier_value = '';
     private $has_identifier_value = false;
     private $has_identifier_value = false;
     /**
     /**
      * Generated from protobuf field <code>optional uint64 positive_int_value = 4;</code>
      * Generated from protobuf field <code>optional uint64 positive_int_value = 4;</code>
      */
      */
-    private $positive_int_value = 0;
+    protected $positive_int_value = 0;
     private $has_positive_int_value = false;
     private $has_positive_int_value = false;
     /**
     /**
      * Generated from protobuf field <code>optional int64 negative_int_value = 5;</code>
      * Generated from protobuf field <code>optional int64 negative_int_value = 5;</code>
      */
      */
-    private $negative_int_value = 0;
+    protected $negative_int_value = 0;
     private $has_negative_int_value = false;
     private $has_negative_int_value = false;
     /**
     /**
      * Generated from protobuf field <code>optional double double_value = 6;</code>
      * Generated from protobuf field <code>optional double double_value = 6;</code>
      */
      */
-    private $double_value = 0.0;
+    protected $double_value = 0.0;
     private $has_double_value = false;
     private $has_double_value = false;
     /**
     /**
      * Generated from protobuf field <code>optional bytes string_value = 7;</code>
      * Generated from protobuf field <code>optional bytes string_value = 7;</code>
      */
      */
-    private $string_value = '';
+    protected $string_value = '';
     private $has_string_value = false;
     private $has_string_value = false;
     /**
     /**
      * Generated from protobuf field <code>optional string aggregate_value = 8;</code>
      * Generated from protobuf field <code>optional string aggregate_value = 8;</code>
      */
      */
-    private $aggregate_value = '';
+    protected $aggregate_value = '';
     private $has_aggregate_value = false;
     private $has_aggregate_value = false;
 
 
     /**
     /**

+ 2 - 2
php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php

@@ -24,12 +24,12 @@ class NamePart extends \Google\Protobuf\Internal\Message
     /**
     /**
      * Generated from protobuf field <code>required string name_part = 1;</code>
      * Generated from protobuf field <code>required string name_part = 1;</code>
      */
      */
-    private $name_part = '';
+    protected $name_part = '';
     private $has_name_part = false;
     private $has_name_part = false;
     /**
     /**
      * Generated from protobuf field <code>required bool is_extension = 2;</code>
      * Generated from protobuf field <code>required bool is_extension = 2;</code>
      */
      */
-    private $is_extension = false;
+    protected $is_extension = false;
     private $has_is_extension = false;
     private $has_is_extension = false;
 
 
     /**
     /**

+ 1 - 1
protoc-artifacts/pom.xml

@@ -8,7 +8,7 @@
   </parent>
   </parent>
   <groupId>com.google.protobuf</groupId>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protoc</artifactId>
   <artifactId>protoc</artifactId>
-  <version>3.11.0-rc-0</version>
+  <version>3.11.0-rc-1</version>
   <packaging>pom</packaging>
   <packaging>pom</packaging>
   <name>Protobuf Compiler</name>
   <name>Protobuf Compiler</name>
   <description>
   <description>

+ 1 - 1
python/google/protobuf/__init__.py

@@ -30,7 +30,7 @@
 
 
 # Copyright 2007 Google Inc. All Rights Reserved.
 # Copyright 2007 Google Inc. All Rights Reserved.
 
 
-__version__ = '3.11.0rc0'
+__version__ = '3.11.0rc1'
 
 
 if __name__ != '__main__':
 if __name__ != '__main__':
   try:
   try:

+ 1 - 1
ruby/google-protobuf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 Gem::Specification.new do |s|
   s.name        = "google-protobuf"
   s.name        = "google-protobuf"
-  s.version     = "3.11.0.rc.0"
+  s.version     = "3.11.0.rc.1"
   git_tag       = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
   git_tag       = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
   s.licenses    = ["BSD-3-Clause"]
   s.licenses    = ["BSD-3-Clause"]
   s.summary     = "Protocol Buffers"
   s.summary     = "Protocol Buffers"