Revert "Make php message class final to avoid mocking (#6277)" (#6324)

This reverts commit 7f84a94366.
This is just temporary. Eventually, we still want to roll forward this
change. Some users are complaining they need more time to clean up their
code.

php/src/Google/Protobuf/Internal/DescriptorProto.php

@@ -15,7 +15,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.DescriptorProto</code>
  */
-final class DescriptorProto extends \Google\Protobuf\Internal\Message
+class DescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>

php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.DescriptorProto.ExtensionRange</code>
  */
-final class ExtensionRange extends \Google\Protobuf\Internal\Message
+class ExtensionRange extends \Google\Protobuf\Internal\Message
 {
     /**
      * Inclusive.

php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php

@@ -17,7 +17,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.DescriptorProto.ReservedRange</code>
  */
-final class ReservedRange extends \Google\Protobuf\Internal\Message
+class ReservedRange extends \Google\Protobuf\Internal\Message
 {
     /**
      * Inclusive.

php/src/Google/Protobuf/Internal/EnumDescriptorProto.php

@@ -15,7 +15,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.EnumDescriptorProto</code>
  */
-final class EnumDescriptorProto extends \Google\Protobuf\Internal\Message
+class EnumDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>

php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php

@@ -19,7 +19,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.EnumDescriptorProto.EnumReservedRange</code>
  */
-final class EnumReservedRange extends \Google\Protobuf\Internal\Message
+class EnumReservedRange extends \Google\Protobuf\Internal\Message
 {
     /**
      * Inclusive.

php/src/Google/Protobuf/Internal/EnumOptions.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.EnumOptions</code>
  */
-final class EnumOptions extends \Google\Protobuf\Internal\Message
+class EnumOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Set this option to true to allow mapping different tag names to the same

php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php

@@ -15,7 +15,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.EnumValueDescriptorProto</code>
  */
-final class EnumValueDescriptorProto extends \Google\Protobuf\Internal\Message
+class EnumValueDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>

php/src/Google/Protobuf/Internal/EnumValueOptions.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.EnumValueOptions</code>
  */
-final class EnumValueOptions extends \Google\Protobuf\Internal\Message
+class EnumValueOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Is this enum value deprecated?

php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.ExtensionRangeOptions</code>
  */
-final class ExtensionRangeOptions extends \Google\Protobuf\Internal\Message
+class ExtensionRangeOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * The parser stores options it doesn't recognize here. See above.

php/src/Google/Protobuf/Internal/FieldDescriptorProto.php

@@ -15,7 +15,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.FieldDescriptorProto</code>
  */
-final class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
+class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>

php/src/Google/Protobuf/Internal/FieldOptions.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.FieldOptions</code>
  */
-final class FieldOptions extends \Google\Protobuf\Internal\Message
+class FieldOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * The ctype option instructs the C++ code generator to use a different

php/src/Google/Protobuf/Internal/FileDescriptorProto.php

@@ -15,7 +15,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.FileDescriptorProto</code>
  */
-final class FileDescriptorProto extends \Google\Protobuf\Internal\Message
+class FileDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * file name, relative to root of source tree

php/src/Google/Protobuf/Internal/FileDescriptorSet.php

@@ -16,7 +16,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.FileDescriptorSet</code>
  */
-final class FileDescriptorSet extends \Google\Protobuf\Internal\Message
+class FileDescriptorSet extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>repeated .google.protobuf.FileDescriptorProto file = 1;</code>

php/src/Google/Protobuf/Internal/FileOptions.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.FileOptions</code>
  */
-final class FileOptions extends \Google\Protobuf\Internal\Message
+class FileOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Sets the Java package where classes generated from this .proto will be

php/src/Google/Protobuf/Internal/GeneratedCodeInfo.php

@@ -17,7 +17,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.GeneratedCodeInfo</code>
  */
-final class GeneratedCodeInfo extends \Google\Protobuf\Internal\Message
+class GeneratedCodeInfo extends \Google\Protobuf\Internal\Message
 {
     /**
      * An Annotation connects some span of text in generated code to an element

php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.GeneratedCodeInfo.Annotation</code>
  */
-final class Annotation extends \Google\Protobuf\Internal\Message
+class Annotation extends \Google\Protobuf\Internal\Message
 {
     /**
      * Identifies the element in the original source .proto file. This field

php/src/Google/Protobuf/Internal/MessageOptions.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.MessageOptions</code>
  */
-final class MessageOptions extends \Google\Protobuf\Internal\Message
+class MessageOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Set true to use the old proto1 MessageSet wire format for extensions.

php/src/Google/Protobuf/Internal/MethodDescriptorProto.php

@@ -15,7 +15,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.MethodDescriptorProto</code>
  */
-final class MethodDescriptorProto extends \Google\Protobuf\Internal\Message
+class MethodDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>

php/src/Google/Protobuf/Internal/MethodOptions.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.MethodOptions</code>
  */
-final class MethodOptions extends \Google\Protobuf\Internal\Message
+class MethodOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Is this method deprecated?

php/src/Google/Protobuf/Internal/OneofDescriptorProto.php

@@ -15,7 +15,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.OneofDescriptorProto</code>
  */
-final class OneofDescriptorProto extends \Google\Protobuf\Internal\Message
+class OneofDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>

php/src/Google/Protobuf/Internal/OneofOptions.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.OneofOptions</code>
  */
-final class OneofOptions extends \Google\Protobuf\Internal\Message
+class OneofOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * The parser stores options it doesn't recognize here. See above.

php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php

@@ -15,7 +15,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.ServiceDescriptorProto</code>
  */
-final class ServiceDescriptorProto extends \Google\Protobuf\Internal\Message
+class ServiceDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>

php/src/Google/Protobuf/Internal/ServiceOptions.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.ServiceOptions</code>
  */
-final class ServiceOptions extends \Google\Protobuf\Internal\Message
+class ServiceOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Is this service deprecated?

php/src/Google/Protobuf/Internal/SourceCodeInfo.php

@@ -16,7 +16,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.SourceCodeInfo</code>
  */
-final class SourceCodeInfo extends \Google\Protobuf\Internal\Message
+class SourceCodeInfo extends \Google\Protobuf\Internal\Message
 {
     /**
      * A Location identifies a piece of source code in a .proto file which

php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php

@@ -13,7 +13,7 @@ use Google\Protobuf\Internal\GPBUtil;
 /**
  * Generated from protobuf message <code>google.protobuf.SourceCodeInfo.Location</code>
  */
-final class Location extends \Google\Protobuf\Internal\Message
+class Location extends \Google\Protobuf\Internal\Message
 {
     /**
      * Identifies which part of the FileDescriptorProto was defined at this

php/src/Google/Protobuf/Internal/UninterpretedOption.php

@@ -20,7 +20,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.UninterpretedOption</code>
  */
-final class UninterpretedOption extends \Google\Protobuf\Internal\Message
+class UninterpretedOption extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption.NamePart name = 2;</code>

php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php

@@ -19,7 +19,7 @@ use Google\Protobuf\Internal\GPBUtil;
  *
  * Generated from protobuf message <code>google.protobuf.UninterpretedOption.NamePart</code>
  */
-final class NamePart extends \Google\Protobuf\Internal\Message
+class NamePart extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>required string name_part = 1;</code>

src/google/protobuf/compiler/php/php_generator.cc

@@ -1265,7 +1265,7 @@ void GenerateMessageFile(const FileDescriptor* file, const Descriptor* message,
   }
 
   printer.Print(
-      "final class ^name^ extends \\Google\\Protobuf\\Internal\\Message\n"
+      "class ^name^ extends \\Google\\Protobuf\\Internal\\Message\n"
       "{\n",
       "name", fullname);
   Indent(&printer);