Automated rollback of commit b603fb69bf0c1aef24dfe5470c9d4ae99b9031b1. PiperOrigin-RevId: 588106016
diff --git a/src/google/protobuf/compiler/php/BUILD.bazel b/src/google/protobuf/compiler/php/BUILD.bazel index 5bddf38..2a9746d 100644 --- a/src/google/protobuf/compiler/php/BUILD.bazel +++ b/src/google/protobuf/compiler/php/BUILD.bazel
@@ -32,6 +32,7 @@ ], deps = [ ":names", + "//src/google/protobuf:descriptor_legacy", "//src/google/protobuf:protobuf_nowkt", "//src/google/protobuf/compiler:code_generator", "//src/google/protobuf/compiler:retention", @@ -39,18 +40,6 @@ ], ) -cc_test( - name = "generator_unittest", - srcs = ["generator_unittest.cc"], - deps = [ - ":php", - "//:protobuf", - "//src/google/protobuf/compiler:command_line_interface_tester", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", - ], -) - ################################################################################ # Distribution packaging ################################################################################
diff --git a/src/google/protobuf/compiler/php/generator_unittest.cc b/src/google/protobuf/compiler/php/generator_unittest.cc deleted file mode 100644 index e53e1d6..0000000 --- a/src/google/protobuf/compiler/php/generator_unittest.cc +++ /dev/null
@@ -1,112 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2023 Google Inc. All rights reserved. -// -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file or at -// https://developers.google.com/open-source/licenses/bsd - -#include <memory> - -#include "google/protobuf/descriptor.pb.h" -#include <gtest/gtest.h> -#include "google/protobuf/compiler/command_line_interface_tester.h" -#include "google/protobuf/compiler/php/php_generator.h" - -namespace google { -namespace protobuf { -namespace compiler { -namespace php { -namespace { - -class PhpGeneratorTest : public CommandLineInterfaceTester { - protected: - PhpGeneratorTest() { - RegisterGenerator("--php_out", "--php_opt", std::make_unique<Generator>(), - "PHP test generator"); - - // Generate built-in protos. - CreateTempFile( - "google/protobuf/descriptor.proto", - google::protobuf::DescriptorProto::descriptor()->file()->DebugString()); - } -}; - -TEST_F(PhpGeneratorTest, Basic) { - CreateTempFile("foo.proto", - R"schema( - syntax = "proto3"; - message Foo { - optional int32 bar = 1; - int32 baz = 2; - })schema"); - - RunProtoc( - "protocol_compiler --proto_path=$tmpdir --php_out=$tmpdir foo.proto"); - - ExpectNoErrors(); -} - -TEST_F(PhpGeneratorTest, Proto2File) { - CreateTempFile("foo.proto", - R"schema( - syntax = "proto2"; - message Foo { - optional int32 bar = 1; - })schema"); - - RunProtoc( - "protocol_compiler --proto_path=$tmpdir --php_out=$tmpdir foo.proto"); - - ExpectNoErrors(); -} - -TEST_F(PhpGeneratorTest, RequiredFieldError) { - CreateTempFile("foo.proto", - R"schema( - syntax = "proto2"; - message FooBar { - required int32 foo_message = 1; - })schema"); - - RunProtoc( - "protocol_compiler --proto_path=$tmpdir --php_out=$tmpdir foo.proto"); - - ExpectErrorSubstring( - "Can't generate PHP code for required field FooBar.foo_message"); -} - -TEST_F(PhpGeneratorTest, GroupFieldError) { - CreateTempFile("foo.proto", - R"schema( - syntax = "proto2"; - message Foo { - optional group Bar = 1 { - optional int32 baz = 1; - }; - })schema"); - - RunProtoc( - "protocol_compiler --proto_path=$tmpdir --php_out=$tmpdir foo.proto"); - - ExpectErrorSubstring("Can't generate PHP code for group field Foo.bar"); -} - -TEST_F(PhpGeneratorTest, ClosedEnumError) { - CreateTempFile("foo.proto", - R"schema( - syntax = "proto2"; - enum Foo { - BAR = 0; - })schema"); - - RunProtoc( - "protocol_compiler --proto_path=$tmpdir --php_out=$tmpdir foo.proto"); - - ExpectErrorSubstring("Can't generate PHP code for closed enum Foo"); -} - -} // namespace -} // namespace php -} // namespace compiler -} // namespace protobuf -} // namespace google
diff --git a/src/google/protobuf/compiler/php/php_generator.cc b/src/google/protobuf/compiler/php/php_generator.cc index 62498ab..433474c 100644 --- a/src/google/protobuf/compiler/php/php_generator.cc +++ b/src/google/protobuf/compiler/php/php_generator.cc
@@ -12,6 +12,7 @@ #include <string> #include <vector> +#include "google/protobuf/compiler/code_generator.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" #include "absl/log/absl_log.h" @@ -21,11 +22,10 @@ #include "absl/strings/str_replace.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" -#include "google/protobuf/compiler/code_generator.h" -#include "google/protobuf/compiler/php/names.h" #include "google/protobuf/compiler/retention.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.pb.h" +#include "google/protobuf/descriptor_legacy.h" #include "google/protobuf/io/printer.h" #include "google/protobuf/io/zero_copy_stream.h" @@ -537,20 +537,8 @@ printer->Outdent(); } -bool GenerateField(const FieldDescriptor* field, io::Printer* printer, - const Options& options, std::string* error) { - if (field->is_required()) { - *error = absl::StrCat("Can't generate PHP code for required field ", - field->full_name(), ".\n"); - return false; - } - if (field->type() == FieldDescriptor::TYPE_GROUP) { - *error = absl::StrCat("Can't generate PHP code for group field ", - field->full_name(), - ". Use regular message encoding instead.\n"); - return false; - } - +void GenerateField(const FieldDescriptor* field, io::Printer* printer, + const Options& options) { if (field->is_repeated()) { GenerateFieldDocComment(printer, field, options, kFieldProperty); printer->Print( @@ -558,7 +546,7 @@ "name", field->name()); } else if (field->real_containing_oneof()) { // Oneof fields are handled by GenerateOneofField. - return true; + return; } else { std::string initial_value = field->has_presence() ? "null" : DefaultForField(field); @@ -568,7 +556,6 @@ "name", field->name(), "initial_value", initial_value); } - return true; } void GenerateOneofField(const OneofDescriptor* oneof, io::Printer* printer) { @@ -1283,17 +1270,9 @@ "fullname", classname); } -bool GenerateEnumFile(const FileDescriptor* file, const EnumDescriptor* en, +void GenerateEnumFile(const FileDescriptor* file, const EnumDescriptor* en, const Options& options, - GeneratorContext* generator_context, std::string* error) { - if (en->is_closed()) { - *error = absl::StrCat("Can't generate PHP code for closed enum ", - en->full_name(), - ". Please use either proto3 or editions without " - "`enum_type = CLOSED`.\n"); - return false; - } - + GeneratorContext* generator_context) { std::string filename = GeneratedClassFileName(en, options); std::unique_ptr<io::ZeroCopyOutputStream> output( generator_context->Open(filename)); @@ -1424,18 +1403,15 @@ "old", en->name()); LegacyReadOnlyGenerateClassFile(file, en, options, generator_context); } - - return true; } -bool GenerateMessageFile(const FileDescriptor* file, const Descriptor* message, +void GenerateMessageFile(const FileDescriptor* file, const Descriptor* message, const Options& options, - GeneratorContext* generator_context, - std::string* error) { + GeneratorContext* generator_context) { // Don't generate MapEntry messages -- we use the PHP extension's native // support for map fields instead. if (message->options().map_entry()) { - return true; + return; } std::string filename = GeneratedClassFileName(message, options); @@ -1485,9 +1461,7 @@ // Field and oneof definitions. for (int i = 0; i < message->field_count(); i++) { const FieldDescriptor* field = message->field(i); - if (!GenerateField(field, &printer, options, error)) { - return false; - } + GenerateField(field, &printer, options); } for (int i = 0; i < message->real_oneof_decl_count(); i++) { const OneofDescriptor* oneof = message->oneof_decl(i); @@ -1559,18 +1533,12 @@ // Nested messages and enums. for (int i = 0; i < message->nested_type_count(); i++) { - if (!GenerateMessageFile(file, message->nested_type(i), options, - generator_context, error)) { - return false; - } + GenerateMessageFile(file, message->nested_type(i), options, + generator_context); } for (int i = 0; i < message->enum_type_count(); i++) { - if (!GenerateEnumFile(file, message->enum_type(i), options, - generator_context, error)) { - return false; - } + GenerateEnumFile(file, message->enum_type(i), options, generator_context); } - return true; } void GenerateServiceFile( @@ -1620,29 +1588,22 @@ printer.Print("}\n\n"); } -bool GenerateFile(const FileDescriptor* file, const Options& options, - GeneratorContext* generator_context, std::string* error) { +void GenerateFile(const FileDescriptor* file, const Options& options, + GeneratorContext* generator_context) { GenerateMetadataFile(file, options, generator_context); for (int i = 0; i < file->message_type_count(); i++) { - if (!GenerateMessageFile(file, file->message_type(i), options, - generator_context, error)) { - return false; - } + GenerateMessageFile(file, file->message_type(i), options, + generator_context); } for (int i = 0; i < file->enum_type_count(); i++) { - if (!GenerateEnumFile(file, file->enum_type(i), options, generator_context, - error)) { - return false; - } + GenerateEnumFile(file, file->enum_type(i), options, generator_context); } if (file->options().php_generic_services()) { for (int i = 0; i < file->service_count(); i++) { GenerateServiceFile(file, file->service(i), options, generator_context); } } - - return true; } static std::string EscapePhpdoc(absl::string_view input) { @@ -2322,7 +2283,18 @@ return false; } - return GenerateFile(file, options, generator_context, error); + if (!options.is_descriptor && + FileDescriptorLegacy(file).syntax() != + FileDescriptorLegacy::Syntax::SYNTAX_PROTO3) { + *error = + "Can only generate PHP code for proto3 .proto files.\n" + "Please add 'syntax = \"proto3\";' to the top of your .proto file.\n"; + return false; + } + + GenerateFile(file, options, generator_context); + + return true; } bool Generator::GenerateAll(const std::vector<const FileDescriptor*>& files,
diff --git a/src/google/protobuf/compiler/php/php_generator.h b/src/google/protobuf/compiler/php/php_generator.h index 96de3c3..b2c0e45 100644 --- a/src/google/protobuf/compiler/php/php_generator.h +++ b/src/google/protobuf/compiler/php/php_generator.h
@@ -8,10 +8,10 @@ #ifndef GOOGLE_PROTOBUF_COMPILER_PHP_GENERATOR_H__ #define GOOGLE_PROTOBUF_COMPILER_PHP_GENERATOR_H__ -#include <cstdint> #include <string> #include "google/protobuf/compiler/code_generator.h" +#include "google/protobuf/compiler/php/names.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/port_def.inc"