From 7f84a943667358a53bd5d255ee9769ca83e75cd9 Mon Sep 17 00:00:00 2001
From: Paul Yang <TeBoring@users.noreply.github.com>
Date: Tue, 18 Jun 2019 17:12:55 -0700
Subject: [PATCH] Make php message class final to avoid mocking (#6277)

* Make php message class final

Because proto messages are just data object, they should not be mocked.
Explicitly make them final to avoid accidental usage.

* Update generated descriptors
---
 csharp/src/Google.Protobuf.Test/testprotos.pb | Bin 205207 -> 205207 bytes
 .../Protobuf/Internal/DescriptorProto.php     |   2 +-
 .../DescriptorProto/ExtensionRange.php        |   2 +-
 .../DescriptorProto/ReservedRange.php         |   2 +-
 .../Protobuf/Internal/EnumDescriptorProto.php |   2 +-
 .../EnumDescriptorProto/EnumReservedRange.php |   2 +-
 .../Google/Protobuf/Internal/EnumOptions.php  |   2 +-
 .../Internal/EnumValueDescriptorProto.php     |   2 +-
 .../Protobuf/Internal/EnumValueOptions.php    |   2 +-
 .../Internal/ExtensionRangeOptions.php        |   2 +-
 .../Internal/FieldDescriptorProto.php         |   2 +-
 .../Google/Protobuf/Internal/FieldOptions.php |   2 +-
 .../Protobuf/Internal/FileDescriptorProto.php |   2 +-
 .../Protobuf/Internal/FileDescriptorSet.php   |   2 +-
 .../Google/Protobuf/Internal/FileOptions.php  |   2 +-
 .../Protobuf/Internal/GeneratedCodeInfo.php   |   2 +-
 .../Internal/GeneratedCodeInfo/Annotation.php |   2 +-
 .../Protobuf/Internal/MessageOptions.php      |   2 +-
 .../Internal/MethodDescriptorProto.php        |   2 +-
 .../Protobuf/Internal/MethodOptions.php       |   2 +-
 .../Internal/OneofDescriptorProto.php         |   2 +-
 .../Google/Protobuf/Internal/OneofOptions.php |   2 +-
 .../Internal/ServiceDescriptorProto.php       |   2 +-
 .../Protobuf/Internal/ServiceOptions.php      |   2 +-
 .../Protobuf/Internal/SourceCodeInfo.php      |   2 +-
 .../Internal/SourceCodeInfo/Location.php      |   2 +-
 .../Protobuf/Internal/UninterpretedOption.php |   2 +-
 .../Internal/UninterpretedOption/NamePart.php |   2 +-
 .../protobuf/compiler/php/php_generator.cc    |   2 +-
 29 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb
index bc3979e965ef354b8491b637c3ca441bb1050365..71256aea778e8a7f1d74a709e2c84ab3acef5727 100644
GIT binary patch
delta 5317
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

delta 5317
zcmYjVYiv}<72dgbX6)R3c=vjF`GFT>8?Z?+k2Xa>69`C!D5Ponkn9LmA*P{fOTwdV
zDm80rBbrolgi3p*7}MZ7N_a_@KwafWlpls7*Nd@>{J;njBAg=QVhnOips4-M+?l=m
z&)=Cd-+9b8=g!*eiFiGc?i0i8{+W}*YwBgjW-GR)ylKh4^``<RGRq2BVm|Bk)>pH)
z)^^*L<3t_79V;na-ff5H8^{P&tTfOj_>I-hLFU-p5iURLJ*sAJr_b8axxSAGVGCfw
zK#Sn4xlWjNJmK=c+E&boI2<5EC>-@YpP-HT5E~VYI2I4P@?$&nmCY1Q7@i;7g|nSe
z0iLiGLR#63T*St##;mCYX5^Q(!$pc85WBK=e35~)$*!$4u#n)=bp{p?d}^(8o2d}k
zJLs*cW&dg%3<59&7z_e1a<b#gGzCL|L3@SYyRgL&V9;K*$*dy4p#Ahl=Z+r$)sA>A
zb?k2AND#n6fRP}8g#aUVyhKx22ry!o`)3ulECd*_E9%WE0*u(T%bfS6ssPS+GW|<g
zrM>1(5Wz--J3#~+5$@RWd78tfO?FwiQ-#9|<M8f!b@i-f>0LV<@m<uZ<wMk=V1?c>
z?fs^nE%@4Wu!Gu^53xhR7gU<u<ukT-Z8O`lA#8Dlv^W7F&KV<4KoHFsaRMUQ84_m$
zg+^Tu>_2=q`Gc)t0i8WC0tLc0KwqGMi2r~DN;-?U@{t`H=DyA%@O)$!CY`@n$Sq=l
zr#bWA<*b^eo4L*kR%F%8!*SIRKx}H}iP;7st7bmWKQpZ2keYevlV%l%)XZy^Ixz~s
zL$2J<t>1CmU*^QMpBF@&3P;j1WzfQTQHl5dN>-l6pN>=H6!=T1qlHIfpz?jO_W<Y7
zoCEb8hQh#r9S1m0((C{}$oZ_C1L+NhcwkT-#Ytz38X_a)(3aV-ioML%wFMoad(p=A
z#e)-h@wn*--HSHr$a{2qBNjN@GgrUPj#%mTfWtyp+j-bOB{+ejoxA>!0R%@oFD=t;
zB<Z*F@)ZW6tL=R8a@|$t$|KzRAlFsO=Lj!|I*U}N7<Kh1q*mhn`<tw~5`UVeVF}qC
z<?)2GMEhdzF>l>!R#$l}-;crXSiT={m-i0*7IfwNQMFy<H$@{bLUr_HhF7yUWMfZI
zJl)Ekpn-HNdw4vl%cEP_!{?Y@*eJe-&#N`7D87eREpcwqV2N0`LcLz+Gi;)vHweHH
zpf?CWH>sEF!GbLa(988;0Yrdat_KSs0`zhWmZudzn6loN>)HB-Y``zb8t@D7XM+L+
z__KVDKV>480DqR3_>&kA{8?UI>(D@mkPZgC{TtYeYX<^;Nmi~uQ}6-*0N0->K=2Q6
zJqaR6<ua#9kdDwKxXksZ3JBW(wZ_yWxXdvL$}m78n07<lidGh-b~pWO*Dso0P5or=
zo3A%H>f05eZ`Tmr9r|nnfhiy2loh0z5_RP$4_)WX{{}|kI?6FrsJtj?Z;Z-&ZUg?t
zS&f+@0a4_bDH0GH$4rrcD00jc8AXxTRFTg|smN=lNFZzj^os;UYS*YpN-gHf&w1#+
z9(OT#e$ESvogX2y7-e?TtJ}n0S$EUq1S107GzSZaEjM|*RJ8#RIo;&*E1YrCUW_j7
zg!lJN?4J!20R>HmiGYG`<Al*3wt!;7Xb%wDm@wJ{gf=Efd-QpU;fN-=_f|bCT@j-L
znKTCi1lD|rsuiTB$LJDH`Ax^)X!=x;9qDb#G##tpnKDfWM0QiA=`j>?Pc?mOjGBJW
zG#v=r0R5%|BH%sK^deWz@X&tYe`AW^Il~L*I{%@T6;an8dT)Q5ebw;LBn2ZPJv1!?
z#GZ$yWq>w8eO&?3vWKQ+fN0r6Y8jPYMD;xOOUK_R{c#Y5q4dY5bgYuADIE||9-GpO
zkWjOrOXYpKg^A70LSL#PRXU(wIv`4K7Fus{SGI`IA9d+*1ZWX>#$B<ITAWI6%S4}J
zS6O45(4SXW5von-j|m_)wFy0{0FhOjD6dcg1Vrs^BDLH=)ZQlQ>Q(J=s{N2qZ;SN+
zDE?3ohKfHV^hCj`^3@Xs5Md4pJyGJw=&;xSJbQWbVN-Wp)eY#^4T!oAo4OOO^hD^a
zt~&v4PZZ8_hN<oZ)!mudvz3jqZJj0|SP`Yu)D4JDou+O;B-Cl@21MPRrfxvg-AQ%d
zB~c~lUGbr?PI||`!=|47P!!BjpM2OU_D6!3sV}_32m`~Mz<@eF5+$X00!m_{CLZ^$
zzQ}4Sj|*O$^P>;oaWQ+2^OW`jKH)9=E?b>GA$Tn3M|bapNVw|ToB*3VC9Kn;Mx7Wi
zP6Y=4=LjH9<&+5f^92yWPl+=B^#q6}oD%i^XCDwvI4xwgp+XZ*i$qmKoqmD>cl)Qm
z0RVBjgE(~SyUpoi6>++SK7ByM={BdIz`2}J(qEOJTYtt#00`RveF*>};u(^_?`_Ol
z*Oi}$&|v2AOY9w1{D~+mb^7QP<=Qx%9%210^WOK_7MAW24mC&80v*pe!7Ekw6h_)G
zL;?e{IVYn2IVcb0a84x40}mvBPNWv(IN@+!@P#=CYB>y=GmWS;q0dtt^tL2Y>ic=&
z&JPSAJuenis*j;dX<iUkxoSKR2m$>w1VnEyh;Xr41=j_U^j|Mn1=9tAm)sGOs;eIL
zecqQpWJl9|0S9H&C-iI3Rr&M@w^CD*4*EoOjm`#b&kAdaUZj%-G}+Kks%*eSC!G~;
zm2n1BRxDafOlf2Tcu`o3^{NdjKtn~Zw2MMN{NW3#iz2bmIIF!ii*!=h+Al1#NIz@<
z4HG@b`h%qCIo2=I=r_GC&=XMg2i=DAC1IK3;Xu$((aY;nkQBYVE{TLW8hUwMA~DeG
z(^YRPVfl9t2uuS3(@F`dfgmgO$P(@Xos@cHiK=R6j6vPSc;txC6>n7oyAmIzq5j(h
zLKKrUS~KO1thI1ktJGP-3Qe?1tqDM6*(#I%a~=>`w#tf>ni0ixKMqK1RQkV)fZ=^W
z;+C`&;F<takdDm%wzC8FYaRIUqhzY=sGvhe-N1mY9kSRTZ^{FqIwZy$NnIH*L^@<y
zofCHowE=qSkma?`KP(*%Bwd-wAG7bVbXR^jQfXIyIJ!4o`Qb>ZUHRc?W_9I<V}%IU
zMd3b(=x{I$Nxr1ya3r;PM{4hDJNKks+O==@_NHfdWj@`>;xdipplDL~kkliAN+OL9
z$z)ZoMw0cAgvx2mkO%Ov<h3~m5;_b4CrN!cpOeHsER)r0OImR#lEq7Mq~I8ld_|6w
zG!H{SN~#~pCnepF$mEm37I2Qp`sMUb5{oBYd0mF?OIGq3OKoi0vwio@SDN;qA>PH;
z+0~-!vT&aBD~K*hdbr_b-eAApcEe~6MriJa49`;f1w^nLa(2o<gt{RYRw>OTNpoLF
z>z>veFucEzPSSaop=ZDpW88apH#?LbH$^EkiW)Z>PzLNAHyTg|L>f05PzGpV+-Sfz
z;K;{G125=c;J77uRmsz-&9657eDBU3J5}LLsU16i>iu~STfGs>erJh*gm}wzRv8pQ
zvO;xM8IZ&+S-H^prH+7zlU~_g_U5L^d?pgpWPUj$rb$^mH^)TcnUomdS50SNnD)l@
lvTLiR^QlNf)A>}Sp=nt>J4Z!7Y^M+2-p4Yx_gSY-{vX!_kkSAE

diff --git a/php/src/Google/Protobuf/Internal/DescriptorProto.php b/php/src/Google/Protobuf/Internal/DescriptorProto.php
index 3b215d52ae4d..2d52831451ce 100644
--- a/php/src/Google/Protobuf/Internal/DescriptorProto.php
+++ b/php/src/Google/Protobuf/Internal/DescriptorProto.php
@@ -15,7 +15,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.DescriptorProto</code>
  */
-class DescriptorProto extends \Google\Protobuf\Internal\Message
+final class DescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
diff --git a/php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php b/php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php
index a2057fd5d17e..fb98f7d5a090 100644
--- a/php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php
+++ b/php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.DescriptorProto.ExtensionRange</code>
  */
-class ExtensionRange extends \Google\Protobuf\Internal\Message
+final class ExtensionRange extends \Google\Protobuf\Internal\Message
 {
     /**
      * Inclusive.
diff --git a/php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php b/php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php
index 73c964faa0b5..fa46419a53ae 100644
--- a/php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php
+++ b/php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php
@@ -17,7 +17,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.DescriptorProto.ReservedRange</code>
  */
-class ReservedRange extends \Google\Protobuf\Internal\Message
+final class ReservedRange extends \Google\Protobuf\Internal\Message
 {
     /**
      * Inclusive.
diff --git a/php/src/Google/Protobuf/Internal/EnumDescriptorProto.php b/php/src/Google/Protobuf/Internal/EnumDescriptorProto.php
index da30fa99067f..b7c3a208bec2 100644
--- a/php/src/Google/Protobuf/Internal/EnumDescriptorProto.php
+++ b/php/src/Google/Protobuf/Internal/EnumDescriptorProto.php
@@ -15,7 +15,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.EnumDescriptorProto</code>
  */
-class EnumDescriptorProto extends \Google\Protobuf\Internal\Message
+final class EnumDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
diff --git a/php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php b/php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php
index e1079585ec01..0103a1b30178 100644
--- a/php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php
+++ b/php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php
@@ -19,7 +19,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.EnumDescriptorProto.EnumReservedRange</code>
  */
-class EnumReservedRange extends \Google\Protobuf\Internal\Message
+final class EnumReservedRange extends \Google\Protobuf\Internal\Message
 {
     /**
      * Inclusive.
diff --git a/php/src/Google/Protobuf/Internal/EnumOptions.php b/php/src/Google/Protobuf/Internal/EnumOptions.php
index 3d74c81c2176..4c73d527409d 100644
--- a/php/src/Google/Protobuf/Internal/EnumOptions.php
+++ b/php/src/Google/Protobuf/Internal/EnumOptions.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.EnumOptions</code>
  */
-class EnumOptions extends \Google\Protobuf\Internal\Message
+final class EnumOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Set this option to true to allow mapping different tag names to the same
diff --git a/php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php b/php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php
index 50bda008e899..d5a0a9afb532 100644
--- a/php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php
+++ b/php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php
@@ -15,7 +15,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.EnumValueDescriptorProto</code>
  */
-class EnumValueDescriptorProto extends \Google\Protobuf\Internal\Message
+final class EnumValueDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
diff --git a/php/src/Google/Protobuf/Internal/EnumValueOptions.php b/php/src/Google/Protobuf/Internal/EnumValueOptions.php
index a267c6d5e25e..50ac904ff972 100644
--- a/php/src/Google/Protobuf/Internal/EnumValueOptions.php
+++ b/php/src/Google/Protobuf/Internal/EnumValueOptions.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.EnumValueOptions</code>
  */
-class EnumValueOptions extends \Google\Protobuf\Internal\Message
+final class EnumValueOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Is this enum value deprecated?
diff --git a/php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php b/php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php
index 00fbebecaf6a..97ad2c055f85 100644
--- a/php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php
+++ b/php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.ExtensionRangeOptions</code>
  */
-class ExtensionRangeOptions extends \Google\Protobuf\Internal\Message
+final class ExtensionRangeOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * The parser stores options it doesn't recognize here. See above.
diff --git a/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php b/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php
index e578197515f8..6f8643c8d72c 100644
--- a/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php
+++ b/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php
@@ -15,7 +15,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.FieldDescriptorProto</code>
  */
-class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
+final class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
diff --git a/php/src/Google/Protobuf/Internal/FieldOptions.php b/php/src/Google/Protobuf/Internal/FieldOptions.php
index 751c278d7823..47d1951d1659 100644
--- a/php/src/Google/Protobuf/Internal/FieldOptions.php
+++ b/php/src/Google/Protobuf/Internal/FieldOptions.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.FieldOptions</code>
  */
-class FieldOptions extends \Google\Protobuf\Internal\Message
+final class FieldOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * The ctype option instructs the C++ code generator to use a different
diff --git a/php/src/Google/Protobuf/Internal/FileDescriptorProto.php b/php/src/Google/Protobuf/Internal/FileDescriptorProto.php
index cb10aa79390f..e95205476cf8 100644
--- a/php/src/Google/Protobuf/Internal/FileDescriptorProto.php
+++ b/php/src/Google/Protobuf/Internal/FileDescriptorProto.php
@@ -15,7 +15,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.FileDescriptorProto</code>
  */
-class FileDescriptorProto extends \Google\Protobuf\Internal\Message
+final class FileDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * file name, relative to root of source tree
diff --git a/php/src/Google/Protobuf/Internal/FileDescriptorSet.php b/php/src/Google/Protobuf/Internal/FileDescriptorSet.php
index 9907b17d73c5..c9a38808fb4c 100644
--- a/php/src/Google/Protobuf/Internal/FileDescriptorSet.php
+++ b/php/src/Google/Protobuf/Internal/FileDescriptorSet.php
@@ -16,7 +16,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.FileDescriptorSet</code>
  */
-class FileDescriptorSet extends \Google\Protobuf\Internal\Message
+final class FileDescriptorSet extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>repeated .google.protobuf.FileDescriptorProto file = 1;</code>
diff --git a/php/src/Google/Protobuf/Internal/FileOptions.php b/php/src/Google/Protobuf/Internal/FileOptions.php
index 6fea195ec18a..911000501643 100644
--- a/php/src/Google/Protobuf/Internal/FileOptions.php
+++ b/php/src/Google/Protobuf/Internal/FileOptions.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.FileOptions</code>
  */
-class FileOptions extends \Google\Protobuf\Internal\Message
+final class FileOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Sets the Java package where classes generated from this .proto will be
diff --git a/php/src/Google/Protobuf/Internal/GeneratedCodeInfo.php b/php/src/Google/Protobuf/Internal/GeneratedCodeInfo.php
index f5a65bea4610..c99d77afa3ad 100644
--- a/php/src/Google/Protobuf/Internal/GeneratedCodeInfo.php
+++ b/php/src/Google/Protobuf/Internal/GeneratedCodeInfo.php
@@ -17,7 +17,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.GeneratedCodeInfo</code>
  */
-class GeneratedCodeInfo extends \Google\Protobuf\Internal\Message
+final class GeneratedCodeInfo extends \Google\Protobuf\Internal\Message
 {
     /**
      * An Annotation connects some span of text in generated code to an element
diff --git a/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php b/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php
index 09f958d2512c..8cc3cdf4573f 100644
--- a/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php
+++ b/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.GeneratedCodeInfo.Annotation</code>
  */
-class Annotation extends \Google\Protobuf\Internal\Message
+final class Annotation extends \Google\Protobuf\Internal\Message
 {
     /**
      * Identifies the element in the original source .proto file. This field
diff --git a/php/src/Google/Protobuf/Internal/MessageOptions.php b/php/src/Google/Protobuf/Internal/MessageOptions.php
index 445394211028..9032c97e9b10 100644
--- a/php/src/Google/Protobuf/Internal/MessageOptions.php
+++ b/php/src/Google/Protobuf/Internal/MessageOptions.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.MessageOptions</code>
  */
-class MessageOptions extends \Google\Protobuf\Internal\Message
+final class MessageOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Set true to use the old proto1 MessageSet wire format for extensions.
diff --git a/php/src/Google/Protobuf/Internal/MethodDescriptorProto.php b/php/src/Google/Protobuf/Internal/MethodDescriptorProto.php
index 1bd5dd3e1c43..25a2c166fd65 100644
--- a/php/src/Google/Protobuf/Internal/MethodDescriptorProto.php
+++ b/php/src/Google/Protobuf/Internal/MethodDescriptorProto.php
@@ -15,7 +15,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.MethodDescriptorProto</code>
  */
-class MethodDescriptorProto extends \Google\Protobuf\Internal\Message
+final class MethodDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
diff --git a/php/src/Google/Protobuf/Internal/MethodOptions.php b/php/src/Google/Protobuf/Internal/MethodOptions.php
index a2c729a9bbed..a9c093ad5d76 100644
--- a/php/src/Google/Protobuf/Internal/MethodOptions.php
+++ b/php/src/Google/Protobuf/Internal/MethodOptions.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.MethodOptions</code>
  */
-class MethodOptions extends \Google\Protobuf\Internal\Message
+final class MethodOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Is this method deprecated?
diff --git a/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php b/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php
index 9ecfe5cbfe96..a703fcb702ca 100644
--- a/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php
+++ b/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php
@@ -15,7 +15,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.OneofDescriptorProto</code>
  */
-class OneofDescriptorProto extends \Google\Protobuf\Internal\Message
+final class OneofDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
diff --git a/php/src/Google/Protobuf/Internal/OneofOptions.php b/php/src/Google/Protobuf/Internal/OneofOptions.php
index 46b516f3019f..749051f31fe8 100644
--- a/php/src/Google/Protobuf/Internal/OneofOptions.php
+++ b/php/src/Google/Protobuf/Internal/OneofOptions.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.OneofOptions</code>
  */
-class OneofOptions extends \Google\Protobuf\Internal\Message
+final class OneofOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * The parser stores options it doesn't recognize here. See above.
diff --git a/php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php b/php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php
index 8de7afd0bcd9..9534f0480e76 100644
--- a/php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php
+++ b/php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php
@@ -15,7 +15,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.ServiceDescriptorProto</code>
  */
-class ServiceDescriptorProto extends \Google\Protobuf\Internal\Message
+final class ServiceDescriptorProto extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>optional string name = 1;</code>
diff --git a/php/src/Google/Protobuf/Internal/ServiceOptions.php b/php/src/Google/Protobuf/Internal/ServiceOptions.php
index 67162f3764e6..55bf7a77582a 100644
--- a/php/src/Google/Protobuf/Internal/ServiceOptions.php
+++ b/php/src/Google/Protobuf/Internal/ServiceOptions.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.ServiceOptions</code>
  */
-class ServiceOptions extends \Google\Protobuf\Internal\Message
+final class ServiceOptions extends \Google\Protobuf\Internal\Message
 {
     /**
      * Is this service deprecated?
diff --git a/php/src/Google/Protobuf/Internal/SourceCodeInfo.php b/php/src/Google/Protobuf/Internal/SourceCodeInfo.php
index dfeb69ff6978..3ddd89226202 100644
--- a/php/src/Google/Protobuf/Internal/SourceCodeInfo.php
+++ b/php/src/Google/Protobuf/Internal/SourceCodeInfo.php
@@ -16,7 +16,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.SourceCodeInfo</code>
  */
-class SourceCodeInfo extends \Google\Protobuf\Internal\Message
+final class SourceCodeInfo extends \Google\Protobuf\Internal\Message
 {
     /**
      * A Location identifies a piece of source code in a .proto file which
diff --git a/php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php b/php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php
index bad247a11f66..470d64c6e23d 100644
--- a/php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php
+++ b/php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php
@@ -13,7 +13,7 @@
 /**
  * Generated from protobuf message <code>google.protobuf.SourceCodeInfo.Location</code>
  */
-class Location extends \Google\Protobuf\Internal\Message
+final class Location extends \Google\Protobuf\Internal\Message
 {
     /**
      * Identifies which part of the FileDescriptorProto was defined at this
diff --git a/php/src/Google/Protobuf/Internal/UninterpretedOption.php b/php/src/Google/Protobuf/Internal/UninterpretedOption.php
index 3b517ec552c1..39273d62fa7a 100644
--- a/php/src/Google/Protobuf/Internal/UninterpretedOption.php
+++ b/php/src/Google/Protobuf/Internal/UninterpretedOption.php
@@ -20,7 +20,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.UninterpretedOption</code>
  */
-class UninterpretedOption extends \Google\Protobuf\Internal\Message
+final class UninterpretedOption extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption.NamePart name = 2;</code>
diff --git a/php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php b/php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php
index 92ee4b44b92f..a2f9250f936f 100644
--- a/php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php
+++ b/php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php
@@ -19,7 +19,7 @@
  *
  * Generated from protobuf message <code>google.protobuf.UninterpretedOption.NamePart</code>
  */
-class NamePart extends \Google\Protobuf\Internal\Message
+final class NamePart extends \Google\Protobuf\Internal\Message
 {
     /**
      * Generated from protobuf field <code>required string name_part = 1;</code>
diff --git a/src/google/protobuf/compiler/php/php_generator.cc b/src/google/protobuf/compiler/php/php_generator.cc
index c47ea33f798b..60d7d8b73b7d 100644
--- a/src/google/protobuf/compiler/php/php_generator.cc
+++ b/src/google/protobuf/compiler/php/php_generator.cc
@@ -1307,7 +1307,7 @@ void GenerateMessageFile(const FileDescriptor* file, const Descriptor* message,
   }
 
   printer.Print(
-      "class ^name^ extends \\Google\\Protobuf\\Internal\\Message\n"
+      "final class ^name^ extends \\Google\\Protobuf\\Internal\\Message\n"
       "{\n",
       "name", fullname);
   Indent(&printer);