v3.7.0RC2

3 files changed, 349 insertions, 324 deletions

diff --git a/PHPINFO b/PHPINFO
index 7104f29..ac6008c 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,4 +1,4 @@
 
 protobuf
 
-Version => 3.6.1
+Version => 3.7.0RC2
diff --git a/REFLECTION b/REFLECTION
index c096fe7..25903f5 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
+Extension [ <persistent> extension #130 protobuf version 3.7.0RC2 ] {
 
   - Dependencies {
     Dependency [ date (Optional) ]
@@ -816,7 +816,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Any implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Any extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -833,7 +833,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [18] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getTypeUrl ] {
@@ -857,39 +857,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method is ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Api implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Api extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -911,7 +911,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [25] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getName ] {
@@ -956,39 +956,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setSyntax ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\BoolValue implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\BoolValue extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1004,7 +1004,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getValue ] {
@@ -1013,39 +1013,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setValue ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\BytesValue implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\BytesValue extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1061,7 +1061,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getValue ] {
@@ -1070,39 +1070,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setValue ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\DoubleValue implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\DoubleValue extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1118,7 +1118,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getValue ] {
@@ -1127,39 +1127,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setValue ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Duration implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Duration extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1176,7 +1176,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [15] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getSeconds ] {
@@ -1191,39 +1191,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setNanos ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Enum implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Enum extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1243,7 +1243,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [21] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getName ] {
@@ -1276,39 +1276,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setSyntax ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\EnumValue implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\EnumValue extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1326,7 +1326,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [17] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getName ] {
@@ -1347,34 +1347,34 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setOptions ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
@@ -1391,7 +1391,12 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       - Static properties [0] {
       }
 
-      - Static methods [0] {
+      - Static methods [2] {
+        Method [ <internal:protobuf> static public method name ] {
+        }
+
+        Method [ <internal:protobuf> static public method value ] {
+        }
       }
 
       - Properties [0] {
@@ -1401,7 +1406,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Field implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Field extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1426,7 +1431,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [31] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getKind ] {
@@ -1489,34 +1494,34 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setDefaultValue ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
@@ -1548,7 +1553,12 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       - Static properties [0] {
       }
 
-      - Static methods [0] {
+      - Static methods [2] {
+        Method [ <internal:protobuf> static public method name ] {
+        }
+
+        Method [ <internal:protobuf> static public method value ] {
+        }
       }
 
       - Properties [0] {
@@ -1558,7 +1568,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\FieldMask implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\FieldMask extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1574,7 +1584,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getPaths ] {
@@ -1583,39 +1593,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setPaths ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\FloatValue implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\FloatValue extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1631,7 +1641,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getValue ] {
@@ -1640,39 +1650,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setValue ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\GPBEmpty implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\GPBEmpty extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1687,42 +1697,42 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [11] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Int32Value implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Int32Value extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1738,7 +1748,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getValue ] {
@@ -1747,39 +1757,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setValue ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Int64Value implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Int64Value extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1795,7 +1805,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getValue ] {
@@ -1804,39 +1814,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setValue ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\ListValue implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\ListValue extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1852,7 +1862,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getValues ] {
@@ -1861,39 +1871,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setValues ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Method implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Method extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -1915,7 +1925,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [25] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getName ] {
@@ -1960,39 +1970,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setSyntax ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Mixin implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Mixin extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -2009,7 +2019,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [15] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getName ] {
@@ -2024,34 +2034,34 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setRoot ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
@@ -2065,7 +2075,12 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       - Static properties [0] {
       }
 
-      - Static methods [0] {
+      - Static methods [2] {
+        Method [ <internal:protobuf> static public method name ] {
+        }
+
+        Method [ <internal:protobuf> static public method value ] {
+        }
       }
 
       - Properties [0] {
@@ -2075,7 +2090,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Option implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Option extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -2092,7 +2107,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [15] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getName ] {
@@ -2107,39 +2122,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setValue ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\SourceContext implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\SourceContext extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -2155,7 +2170,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getFileName ] {
@@ -2164,39 +2179,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setFileName ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\StringValue implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\StringValue extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -2212,7 +2227,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getValue ] {
@@ -2221,39 +2236,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setValue ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Struct implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Struct extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -2269,7 +2284,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getFields ] {
@@ -2278,34 +2293,34 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
@@ -2320,7 +2335,12 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       - Static properties [0] {
       }
 
-      - Static methods [0] {
+      - Static methods [2] {
+        Method [ <internal:protobuf> static public method name ] {
+        }
+
+        Method [ <internal:protobuf> static public method value ] {
+        }
       }
 
       - Properties [0] {
@@ -2330,7 +2350,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Timestamp implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Timestamp extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -2347,7 +2367,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [17] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method fromDateTime ] {
@@ -2368,39 +2388,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setNanos ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Type implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Type extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -2421,7 +2441,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [23] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getName ] {
@@ -2460,39 +2480,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setSyntax ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\UInt32Value implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\UInt32Value extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -2508,7 +2528,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getValue ] {
@@ -2517,39 +2537,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setValue ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\UInt64Value implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\UInt64Value extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -2565,7 +2585,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [13] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getValue ] {
@@ -2574,39 +2594,39 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method setValue ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
 
-    Class [ <internal:protobuf> class Google\Protobuf\Value implements Google\Protobuf\Internal\Message ] {
+    Class [ <internal:protobuf> class Google\Protobuf\Value extends Google\Protobuf\Internal\Message ] {
 
       - Constants [0] {
       }
@@ -2622,7 +2642,7 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
       }
 
       - Methods [24] {
-        Method [ <internal:protobuf, ctor> public method __construct ] {
+        Method [ <internal:protobuf, overwrites Google\Protobuf\Internal\Message, ctor> public method __construct ] {
         }
 
         Method [ <internal:protobuf> public method getNullValue ] {
@@ -2664,34 +2684,34 @@ Extension [ <persistent> extension #124 protobuf version 3.6.1 ] {
         Method [ <internal:protobuf> public method getKind ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method clear ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method clear ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method discardUnknownFields ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method serializeToJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFromJsonString ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> public method mergeFrom ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> public method mergeFrom ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method readOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method readOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method writeOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method writeOneof ] {
         }
 
-        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message> protected method whichOneof ] {
+        Method [ <internal:protobuf, inherits Google\Protobuf\Internal\Message, prototype Google\Protobuf\Internal\Message> protected method whichOneof ] {
         }
       }
     }
diff --git a/php-pecl-protobuf.spec b/php-pecl-protobuf.spec
index 10a7592..24a63c0 100644
--- a/php-pecl-protobuf.spec
+++ b/php-pecl-protobuf.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-protobuf
 #
-# Copyright (c) 2016-2018 Remi Collet
+# Copyright (c) 2016-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -22,14 +22,16 @@
 %else
 %global ini_name    40-%{pecl_name}.ini
 %endif
+%global upstream_version 3.7.0
+%global upstream_prever  RC2
 
 Summary:       Mechanism for serializing structured data
 Name:          %{?sub_prefix}php-pecl-%{pecl_name}
-Version:       3.6.1
+Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       BSD
 URL:           http://pecl.php.net/package/%{pecl_name}
-Source0:       http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+Source0:       http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 5.5.9
@@ -90,7 +92,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -c 
-mv %{pecl_name}-%{version}%{?prever} NTS
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
@@ -102,8 +104,8 @@ sed -e 's/role="test"/role="src"/' \
 cd NTS
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_PROTOBUF_VERSION/{s/.* "//;s/".*$//;p}' protobuf.h)
-if test "x${extver}" != "x%{version}%{?prever}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}.
+if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
 fi
 cd ..
@@ -216,6 +218,9 @@ fi
 
 
 %changelog
+* Mon Feb  4 2019 Remi Collet <remi@remirepo.net> - 3.7.0~RC2-1
+- update to 3.7.0RC2
+
 * Sat Aug 11 2018 Remi Collet <remi@remirepo.net> - 3.6.1-1
 - update to 3.6.1
 - drop patch merged upstream