From 7f2368933ab3d96140f125e8141c25157caef88e Mon Sep 17 00:00:00 2001
From: "David L. Jones" <dlj@google.com>
Date: Thu, 19 May 2022 16:02:36 -0700
Subject: [PATCH] Re-generate csharp and php golden proto files after changes
 to descriptor.proto.

---
 csharp/src/Google.Protobuf.Test/testprotos.pb | Bin 344236 -> 344150 bytes
 .../Google.Protobuf/Reflection/Descriptor.cs  |   7 ++---
 .../Google/Protobuf/Internal/FieldOptions.php |  24 ++++++------------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb
index 83958c6097de21507388e922bdd6647de49fbd80..4bc182570b31f0469177a01e4fbfdf9456916cee 100644
GIT binary patch
delta 4144
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
W;=Hr};D-W#7XIRegCEML$NmptS13dP

delta 4186
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

diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs
index 1cb43c0ea3..7e7a1a528e 100644
--- a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs
+++ b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs
@@ -7098,11 +7098,8 @@ namespace Google.Protobuf.Reflection {
     /// check its required fields, regardless of whether or not the message has
     /// been parsed.
     ///
-    /// As of 2021, lazy does no correctness checks on the byte stream during
-    /// parsing.  This may lead to crashes if and when an invalid byte stream is
-    /// finally parsed upon access.
-    ///
-    /// TODO(b/211906113):  Enable validation on lazy fields.
+    /// As of May 2022, lazy verifies the contents of the byte stream during
+    /// parsing.  An invalid byte stream will cause the overall parsing to fail.
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
diff --git a/php/src/Google/Protobuf/Internal/FieldOptions.php b/php/src/Google/Protobuf/Internal/FieldOptions.php
index 665cb065a8..ea32e7f2ad 100644
--- a/php/src/Google/Protobuf/Internal/FieldOptions.php
+++ b/php/src/Google/Protobuf/Internal/FieldOptions.php
@@ -74,10 +74,8 @@ class FieldOptions extends \Google\Protobuf\Internal\Message
      * implementation must either *always* check its required fields, or *never*
      * check its required fields, regardless of whether or not the message has
      * been parsed.
-     * As of 2021, lazy does no correctness checks on the byte stream during
-     * parsing.  This may lead to crashes if and when an invalid byte stream is
-     * finally parsed upon access.
-     * TODO(b/211906113):  Enable validation on lazy fields.
+     * As of May 2022, lazy verifies the contents of the byte stream during
+     * parsing.  An invalid byte stream will cause the overall parsing to fail.
      *
      * Generated from protobuf field <code>optional bool lazy = 5 [default = false];</code>
      */
@@ -165,10 +163,8 @@ class FieldOptions extends \Google\Protobuf\Internal\Message
      *           implementation must either *always* check its required fields, or *never*
      *           check its required fields, regardless of whether or not the message has
      *           been parsed.
-     *           As of 2021, lazy does no correctness checks on the byte stream during
-     *           parsing.  This may lead to crashes if and when an invalid byte stream is
-     *           finally parsed upon access.
-     *           TODO(b/211906113):  Enable validation on lazy fields.
+     *           As of May 2022, lazy verifies the contents of the byte stream during
+     *           parsing.  An invalid byte stream will cause the overall parsing to fail.
      *     @type bool $unverified_lazy
      *           unverified_lazy does no correctness checks on the byte stream. This should
      *           only be used where lazy with verification is prohibitive for performance
@@ -354,10 +350,8 @@ class FieldOptions extends \Google\Protobuf\Internal\Message
      * implementation must either *always* check its required fields, or *never*
      * check its required fields, regardless of whether or not the message has
      * been parsed.
-     * As of 2021, lazy does no correctness checks on the byte stream during
-     * parsing.  This may lead to crashes if and when an invalid byte stream is
-     * finally parsed upon access.
-     * TODO(b/211906113):  Enable validation on lazy fields.
+     * As of May 2022, lazy verifies the contents of the byte stream during
+     * parsing.  An invalid byte stream will cause the overall parsing to fail.
      *
      * Generated from protobuf field <code>optional bool lazy = 5 [default = false];</code>
      * @return bool
@@ -402,10 +396,8 @@ class FieldOptions extends \Google\Protobuf\Internal\Message
      * implementation must either *always* check its required fields, or *never*
      * check its required fields, regardless of whether or not the message has
      * been parsed.
-     * As of 2021, lazy does no correctness checks on the byte stream during
-     * parsing.  This may lead to crashes if and when an invalid byte stream is
-     * finally parsed upon access.
-     * TODO(b/211906113):  Enable validation on lazy fields.
+     * As of May 2022, lazy verifies the contents of the byte stream during
+     * parsing.  An invalid byte stream will cause the overall parsing to fail.
      *
      * Generated from protobuf field <code>optional bool lazy = 5 [default = false];</code>
      * @param bool $var