From 032e6288f3c29dceeb46d502277c640530bb5481 Mon Sep 17 00:00:00 2001
From: Joey Harrington <jharrington@netflix.com>
Date: Thu, 14 Aug 2025 10:51:33 -0700
Subject: [PATCH] fix: invalid syntax in descriptor.proto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A recent change (#2075) edited descriptor.proto to include a `reserved`
statement that combines a field number and field name in the same line.
This is specifically called out in the proto language guide as invalid.

https://protobuf.dev/programming-guides/editions/#reserved

> Note that you can’t mix field names and numeric values in the same
> `reserved` statement.

Protobuf.js itself seems to handle this syntax just fine, but other
tools like protoc will choke on it.
---
 google/protobuf/descriptor.json  | 4 ++--
 google/protobuf/descriptor.proto | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/google/protobuf/descriptor.json b/google/protobuf/descriptor.json
index 215e003d0..300227baf 100644
--- a/google/protobuf/descriptor.json
+++ b/google/protobuf/descriptor.json
@@ -588,11 +588,11 @@
                   42,
                   42
                 ],
-                "php_generic_services",
                 [
                   38,
                   38
-                ]
+                ],
+                "php_generic_services"
               ],
               "nested": {
                 "OptimizeMode": {
diff --git a/google/protobuf/descriptor.proto b/google/protobuf/descriptor.proto
index 675ea796e..1b130fdc4 100644
--- a/google/protobuf/descriptor.proto
+++ b/google/protobuf/descriptor.proto
@@ -229,7 +229,8 @@ message FileOptions {
 
     extensions 1000 to max;
 
-    reserved 42, "php_generic_services", 38;
+    reserved 42, 38;
+    reserved "php_generic_services";
 }
 
 message MessageOptions {